[mapguide-commits] r8089 - in branches/2.6/MgDev: . Oem/SWIGEx Oem/SWIGEx/Linux Oem/dbxml/xqilla Oem/dbxml/xqilla/src/items Server/src/Core

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-04-29 08:24:28 -0700 (Tue, 29 Apr 2014)
New Revision: 8089

Added:
   branches/2.6/MgDev/Oem/SWIGEx/Linux/
   branches/2.6/MgDev/Oem/SWIGEx/Linux/swig
Removed:
   branches/2.6/MgDev/Oem/SWIGEx/Linux/swig
Modified:
   branches/2.6/MgDev/Oem/dbxml/xqilla/Makefile.am
   branches/2.6/MgDev/Oem/dbxml/xqilla/Makefile.in
   branches/2.6/MgDev/Oem/dbxml/xqilla/src/items/DatatypeFactoryTemplate.hpp
   branches/2.6/MgDev/Server/src/Core/Makefile.am
   branches/2.6/MgDev/build_oem.sh
Log:
#2436: Port GCC fixes to 2.6

Deleted: branches/2.6/MgDev/Oem/SWIGEx/Linux/swig
===================================================================
(Binary files differ)

Copied: branches/2.6/MgDev/Oem/SWIGEx/Linux/swig (from rev 8083, trunk/MgDev/Oem/SWIGEx/Linux/swig)
===================================================================
(Binary files differ)

Modified: branches/2.6/MgDev/Oem/dbxml/xqilla/Makefile.am
===================================================================
--- branches/2.6/MgDev/Oem/dbxml/xqilla/Makefile.am	2014-04-29 14:29:59 UTC (rev 8088)
+++ branches/2.6/MgDev/Oem/dbxml/xqilla/Makefile.am	2014-04-29 15:24:28 UTC (rev 8089)
@@ -640,7 +640,7 @@
 	$(LEX) -BUs -Pxq -S$(LEXSKEL) -o$(LEXERFILE) $(LEXTEMPLATE) # This can take a long time
 
 $(PARSERCPP) $(PARSERHPP): $(PARSERFILE)
-	$(YACC) -d -v -o $(PARSERCPP) $(PARSERFILE)
+	if [ ! -f $(PARSERCPP) ]; then $(YACC) -d -v -o $(PARSERCPP) $(PARSERFILE); fi;
 
 .PHONY: test docs
 

Modified: branches/2.6/MgDev/Oem/dbxml/xqilla/Makefile.in
===================================================================
--- branches/2.6/MgDev/Oem/dbxml/xqilla/Makefile.in	2014-04-29 14:29:59 UTC (rev 8088)
+++ branches/2.6/MgDev/Oem/dbxml/xqilla/Makefile.in	2014-04-29 15:24:28 UTC (rev 8089)
@@ -5375,7 +5375,7 @@
 $(LEXERFILE): $(LEXTEMPLATE) $(LEXSKEL)
 
 $(PARSERCPP) $(PARSERHPP): $(PARSERFILE)
-	$(YACC) -d -v -o $(PARSERCPP) $(PARSERFILE)
+	if [ ! -f $(PARSERCPP) ]; then $(YACC) -d -v -o $(PARSERCPP) $(PARSERFILE); fi;
 
 .PHONY: test docs
 

Modified: branches/2.6/MgDev/Oem/dbxml/xqilla/src/items/DatatypeFactoryTemplate.hpp
===================================================================
--- branches/2.6/MgDev/Oem/dbxml/xqilla/src/items/DatatypeFactoryTemplate.hpp	2014-04-29 14:29:59 UTC (rev 8088)
+++ branches/2.6/MgDev/Oem/dbxml/xqilla/src/items/DatatypeFactoryTemplate.hpp	2014-04-29 15:24:28 UTC (rev 8089)
@@ -79,8 +79,8 @@
   AnyAtomicType::Ptr createInstance(const XMLCh* value,
                                     const DynamicContext* context) const
   {
-    return createInstanceNoCheck(DatatypeFactoryTemplate<TYPE>::getPrimitiveTypeURI(),
-                                 DatatypeFactoryTemplate<TYPE>::getPrimitiveTypeName(), value, context);
+    return this->createInstanceNoCheck(DatatypeFactoryTemplate<TYPE>::getPrimitiveTypeURI(),
+                                       DatatypeFactoryTemplate<TYPE>::getPrimitiveTypeName(), value, context);
   }
 
   bool checkInstance(const XMLCh* value,

Modified: branches/2.6/MgDev/Server/src/Core/Makefile.am
===================================================================
--- branches/2.6/MgDev/Server/src/Core/Makefile.am	2014-04-29 14:29:59 UTC (rev 8088)
+++ branches/2.6/MgDev/Server/src/Core/Makefile.am	2014-04-29 15:24:28 UTC (rev 8089)
@@ -91,6 +91,7 @@
 
 mgserver_LDADD = \
   -lACE \
+  -ldl \
   -ldb_cxx \
   -ldbxml \
   -ldwfcore \

Modified: branches/2.6/MgDev/build_oem.sh
===================================================================
--- branches/2.6/MgDev/build_oem.sh	2014-04-29 14:29:59 UTC (rev 8088)
+++ branches/2.6/MgDev/build_oem.sh	2014-04-29 15:24:28 UTC (rev 8089)
@@ -118,7 +118,10 @@
 build_dwfcore()
 {
     pushd DWFTK7.1/develop/global/src/dwfcore
+    aclocal
     libtoolize --copy --force
+    automake --add-missing --copy
+    autoconf
     sh ./configure --enable-optimized --prefix="${INSTALLDIR}"
     make
     check_build
@@ -151,7 +154,10 @@
 build_dwftk()
 {
     pushd DWFTK7.1/develop/global/src/dwf
+    aclocal
     libtoolize --copy --force
+    automake --add-missing --copy
+    autoconf
     sh ./configure --enable-optimized --prefix="${INSTALLDIR}"
     make
     check_build
@@ -184,7 +190,10 @@
 build_dwfemap()
 {
     pushd DWFTK7.1/develop/global/src/dwfemap
+    aclocal
     libtoolize --copy --force
+    automake --add-missing --copy
+    autoconf
     sh ./configure --enable-optimized --prefix="${INSTALLDIR}"
     make
     check_build
@@ -622,7 +631,7 @@
 #**********************************************************
 
 pushd Oem
-for lib in ace dwfcore dwftk dwfemap geos swigex bdbxml cppunit imake zlib libpng jpeg freetype gd agg json csmap;
+for lib in ace dwfcore dwftk dwfemap geos bdbxml cppunit imake zlib libpng jpeg freetype gd agg json csmap;
 do
     echo "$lib: Initialization..........................."
     init_"$lib"