[mapguide-commits] r8755 - in sandbox/adsk/2.6l: . Oem/dbxml/xqilla Oem/dbxml/xqilla/src/items Server/src/Services/Resource

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2015-09-07 00:44:42 -0700 (Mon, 07 Sep 2015)
New Revision: 8755

Modified:
   sandbox/adsk/2.6l/Oem/dbxml/xqilla/Makefile.am
   sandbox/adsk/2.6l/Oem/dbxml/xqilla/Makefile.in
   sandbox/adsk/2.6l/Oem/dbxml/xqilla/src/items/DatatypeFactoryTemplate.hpp
   sandbox/adsk/2.6l/Server/src/Services/Resource/DbEnvironment.cpp
   sandbox/adsk/2.6l/build_oem.sh
Log:
Merge part of r8089 and r8100 to sandbox/adsk/2.6l branch.

Modified: sandbox/adsk/2.6l/Oem/dbxml/xqilla/Makefile.am
===================================================================
--- sandbox/adsk/2.6l/Oem/dbxml/xqilla/Makefile.am	2015-08-26 02:20:30 UTC (rev 8754)
+++ sandbox/adsk/2.6l/Oem/dbxml/xqilla/Makefile.am	2015-09-07 07:44:42 UTC (rev 8755)
@@ -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: sandbox/adsk/2.6l/Oem/dbxml/xqilla/Makefile.in
===================================================================
--- sandbox/adsk/2.6l/Oem/dbxml/xqilla/Makefile.in	2015-08-26 02:20:30 UTC (rev 8754)
+++ sandbox/adsk/2.6l/Oem/dbxml/xqilla/Makefile.in	2015-09-07 07:44:42 UTC (rev 8755)
@@ -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: sandbox/adsk/2.6l/Oem/dbxml/xqilla/src/items/DatatypeFactoryTemplate.hpp
===================================================================
--- sandbox/adsk/2.6l/Oem/dbxml/xqilla/src/items/DatatypeFactoryTemplate.hpp	2015-08-26 02:20:30 UTC (rev 8754)
+++ sandbox/adsk/2.6l/Oem/dbxml/xqilla/src/items/DatatypeFactoryTemplate.hpp	2015-09-07 07:44:42 UTC (rev 8755)
@@ -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: sandbox/adsk/2.6l/Server/src/Services/Resource/DbEnvironment.cpp
===================================================================
--- sandbox/adsk/2.6l/Server/src/Services/Resource/DbEnvironment.cpp	2015-08-26 02:20:30 UTC (rev 8754)
+++ sandbox/adsk/2.6l/Server/src/Services/Resource/DbEnvironment.cpp	2015-09-07 07:44:42 UTC (rev 8755)
@@ -236,7 +236,7 @@
         }
         catch (...)
         {
-            assert(false);
+            //assert(false);
         }
     }
 }

Modified: sandbox/adsk/2.6l/build_oem.sh
===================================================================
--- sandbox/adsk/2.6l/build_oem.sh	2015-08-26 02:20:30 UTC (rev 8754)
+++ sandbox/adsk/2.6l/build_oem.sh	2015-09-07 07:44:42 UTC (rev 8755)
@@ -110,7 +110,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
@@ -141,7 +144,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
@@ -172,7 +178,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