[mapguide-commits] r6568 - in trunk/MgDev: . BuildTools/WebTools/IMake Common/Renderers Common/Security Common/Stylization Oem Oem/ACE/ACE_wrappers/include/makeinclude Oem/SWIGEx Oem/dbxml/xqilla Oem/dbxml/xqilla/include/xqilla/framework Oem/geos-2.2.0 Server/src/Gws/GwsQueryEngine Web/src/CgiAgent

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Wed Apr 11 11:07:14 EDT 2012 

Author: jng
Date: 2012-04-11 08:07:14 -0700 (Wed, 11 Apr 2012)
New Revision: 6568

Modified:
   trunk/MgDev/BuildTools/WebTools/IMake/Makefile
   trunk/MgDev/BuildTools/WebTools/IMake/stdafx.h
   trunk/MgDev/Common/Renderers/Makefile.am
   trunk/MgDev/Common/Renderers/ObservationMesh.cpp
   trunk/MgDev/Common/Security/CryptographyUtil.cpp
   trunk/MgDev/Common/Stylization/Makefile.am
   trunk/MgDev/Common/Stylization/SE_BufferPool.cpp
   trunk/MgDev/Common/Stylization/atom.h
   trunk/MgDev/Common/Stylization/atom_element_structure.h
   trunk/MgDev/Oem/ACE/ACE_wrappers/include/makeinclude/platform_linux.GNU
   trunk/MgDev/Oem/ACE/ACE_wrappers/include/makeinclude/platform_linux_common.GNU
   trunk/MgDev/Oem/Makefile.am
   trunk/MgDev/Oem/SWIGEx/Makefile
   trunk/MgDev/Oem/dbxml/xqilla/Makefile.in
   trunk/MgDev/Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp
   trunk/MgDev/Oem/geos-2.2.0/configure.in
   trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp
   trunk/MgDev/Web/src/CgiAgent/Makefile.am
   trunk/MgDev/configure.in
Log:
#1977: Apply fixes to allow MapGuide to build on Ubuntu 11.10 (which uses GCC 4.6)

Modified: trunk/MgDev/BuildTools/WebTools/IMake/Makefile
===================================================================
--- trunk/MgDev/BuildTools/WebTools/IMake/Makefile	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/BuildTools/WebTools/IMake/Makefile	2012-04-11 15:07:14 UTC (rev 6568)
@@ -12,8 +12,8 @@
 CXX      = g++
 LEX      = flex
 YACC     = yacc
-CFLAGS   = -pipe -UZTS -Wall -W -O2 -g -pipe -march=i386 -mcpu=i686 -fno-use-cxa-atexit -fexceptions  -DNDEBUG
-CXXFLAGS = -pipe -UZTS -Wall -W -O2 -g -pipe -march=i386 -mcpu=i686 -fno-use-cxa-atexit -fexceptions  -DNDEBUG
+CFLAGS   = -pipe -UZTS -Wall -W -O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions  -DNDEBUG
+CXXFLAGS = -pipe -UZTS -Wall -W -O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions  -DNDEBUG
 LEXFLAGS = 
 YACCFLAGS= -d
 INCPATH  = -I$(QTDIR)/mkspecs/default -I.
@@ -100,8 +100,7 @@
 yaccclean:
 lexclean:
 clean:
-	-$(DEL_FILE) $(OBJECTS) 
-	-$(DEL_FILE) Makefile
+	-$(DEL_FILE) $(OBJECTS)
 	-$(DEL_FILE) *~ core *.core
 
 

Modified: trunk/MgDev/BuildTools/WebTools/IMake/stdafx.h
===================================================================
--- trunk/MgDev/BuildTools/WebTools/IMake/stdafx.h	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/BuildTools/WebTools/IMake/stdafx.h	2012-04-11 15:07:14 UTC (rev 6568)
@@ -17,5 +17,6 @@
 #include <ctype.h>
 #include <cstdlib>
 #include <cstring>
+#include <cstdio>
 
 #endif

Modified: trunk/MgDev/Common/Renderers/Makefile.am
===================================================================
--- trunk/MgDev/Common/Renderers/Makefile.am	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Common/Renderers/Makefile.am	2012-04-11 15:07:14 UTC (rev 6568)
@@ -88,6 +88,12 @@
   ../../Oem/gd/freetype/objs/.libs/libfreetype.a \
   ../../Oem/gd/jpeg/.libs/libjpeg.a \
   ../../Oem/gd/lpng/libpng.a \
-  ../../Oem/agg-2.4/src/libagg.a
+  ../../Oem/agg-2.4/src/libagg.a \
+  -ldwfcore \
+  -ldwftk \
+  -ldwfemap
 
-libMgRenderers_la_LDFLAGS = -release $(PACKAGE_VERSION)
+libMgRenderers_la_LDFLAGS = -release $(PACKAGE_VERSION) \
+  -L../../Oem/DWFTK7.1/develop/global/src/dwfcore/.libs \
+  -L../../Oem/DWFTK7.1/develop/global/src/dwf/.libs \
+  -L../../Oem/DWFTK7.1/develop/global/src/dwfemap/.libs

Modified: trunk/MgDev/Common/Renderers/ObservationMesh.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/ObservationMesh.cpp	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Common/Renderers/ObservationMesh.cpp	2012-04-11 15:07:14 UTC (rev 6568)
@@ -22,6 +22,7 @@
 #include "RS_OutputStream.h"
 #include <map>
 #include <cstring>
+#include <cstdio>
 
 //desired observation mesh accuracy (in degrees)
 #define OM_TOLERANCE 1e-5

Modified: trunk/MgDev/Common/Security/CryptographyUtil.cpp
===================================================================
--- trunk/MgDev/Common/Security/CryptographyUtil.cpp	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Common/Security/CryptographyUtil.cpp	2012-04-11 15:07:14 UTC (rev 6568)
@@ -17,6 +17,7 @@
 
 #include "CryptographyUtil.h"
 #include <cstring>
+#include <cstdio>
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Constants.

Modified: trunk/MgDev/Common/Stylization/Makefile.am
===================================================================
--- trunk/MgDev/Common/Stylization/Makefile.am	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Common/Stylization/Makefile.am	2012-04-11 15:07:14 UTC (rev 6568)
@@ -202,6 +202,7 @@
   Vector3D.h \
   TransformMesh.h
 
-libMgStylization_la_LIBADD =
+libMgStylization_la_LIBADD = -lExpressionEngine
 
-libMgStylization_la_LDFLAGS = -release $(PACKAGE_VERSION)
+libMgStylization_la_LDFLAGS = -release $(PACKAGE_VERSION) \
+  -L$(map_fdo_lib)

Modified: trunk/MgDev/Common/Stylization/SE_BufferPool.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_BufferPool.cpp	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Common/Stylization/SE_BufferPool.cpp	2012-04-11 15:07:14 UTC (rev 6568)
@@ -17,8 +17,8 @@
 
 #include "stdafx.h"
 #include "SE_BufferPool.h"
+#include <cstdlib>
 
-
 SE_BufferPool::SE_BufferPool()
 {
 }

Modified: trunk/MgDev/Common/Stylization/atom.h
===================================================================
--- trunk/MgDev/Common/Stylization/atom.h	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Common/Stylization/atom.h	2012-04-11 15:07:14 UTC (rev 6568)
@@ -1962,7 +1962,7 @@
     virtual IStructure* Outer()      const = 0;
 
     // What is the "shape" of the run?  Does it flow and wrap, or... ?
-    virtual Shape::Type Shape()      const = 0;
+    virtual Shape::Type GetShape()      const = 0;
 
     // Is selection considered continuous with previous run?
     virtual bool        Continuous() const = 0;

Modified: trunk/MgDev/Common/Stylization/atom_element_structure.h
===================================================================
--- trunk/MgDev/Common/Stylization/atom_element_structure.h	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Common/Stylization/atom_element_structure.h	2012-04-11 15:07:14 UTC (rev 6568)
@@ -44,7 +44,7 @@
     }
 
     // What is the "shape" of the run?  Does it flow and wrap, or... ?
-    ATOM::Shape::Type Shape() const
+    ATOM::Shape::Type GetShape() const
     {
         return m_eShape;
     }

Modified: trunk/MgDev/Oem/ACE/ACE_wrappers/include/makeinclude/platform_linux.GNU
===================================================================
--- trunk/MgDev/Oem/ACE/ACE_wrappers/include/makeinclude/platform_linux.GNU	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Oem/ACE/ACE_wrappers/include/makeinclude/platform_linux.GNU	2012-04-11 15:07:14 UTC (rev 6568)
@@ -80,7 +80,7 @@
 ifeq ($(threads),1)
   LIBS += -lpthread
   # look for the rt library in the usual places
-  LIBS += $(shell test "`ls -L /usr/lib*/librt.so* /lib*/librt.so*`" && echo -lrt)
+  LIBS += $(shell getconf AIO_LISTIO_MAX >/dev/null 2>&1 && echo -lrt)
 endif
 
 ifeq ($(optimize),1)

Modified: trunk/MgDev/Oem/ACE/ACE_wrappers/include/makeinclude/platform_linux_common.GNU
===================================================================
--- trunk/MgDev/Oem/ACE/ACE_wrappers/include/makeinclude/platform_linux_common.GNU	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Oem/ACE/ACE_wrappers/include/makeinclude/platform_linux_common.GNU	2012-04-11 15:07:14 UTC (rev 6568)
@@ -85,7 +85,7 @@
 endif
 
 PLATFORM_AIO_SUPPORT := \
-       $(shell test "`ls -L /usr/lib*/librt.so* /lib*/librt.so*`" && echo -DACE_HAS_AIO_CALLS)
+       $(shell getconf AIO_LISTIO_MAX >/dev/null 2>&1 && echo -DACE_HAS_AIO_CALLS)
 
 GNU_LIBPTHREAD_VERSION := $(shell getconf GNU_LIBPTHREAD_VERSION 2> /dev/null || echo Unknown)
 ifeq (NPTL, $(word 1,$(GNU_LIBPTHREAD_VERSION)))

Modified: trunk/MgDev/Oem/Makefile.am
===================================================================
--- trunk/MgDev/Oem/Makefile.am	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Oem/Makefile.am	2012-04-11 15:07:14 UTC (rev 6568)
@@ -18,8 +18,5 @@
 	@cp -fpd dbxml/install/lib/libdb_cxx*.so* ${prefix}/lib
 	@cp -fpd dbxml/install/lib/libdbxml*.so* ${prefix}/lib
 	@cp -fp  DWFTK7.1/develop/global/src/dwfcore/.libs/libdwfcore-* ${prefix}/lib
-	@cp -fpd DWFTK7.1/develop/global/src/dwfcore/.libs/libdwfcore ${prefix}/lib
 	@cp -fp  DWFTK7.1/develop/global/src/dwfemap/.libs/libdwfemap-* ${prefix}/lib
-	@cp -fpd DWFTK7.1/develop/global/src/dwfemap/.libs/libdwfemap ${prefix}/lib
 	@cp -fp  DWFTK7.1/develop/global/src/dwf/.libs/libdwftk-* ${prefix}/lib
-	@cp -fpd DWFTK7.1/develop/global/src/dwf/.libs/libdwftk ${prefix}/lib

Modified: trunk/MgDev/Oem/SWIGEx/Makefile
===================================================================
--- trunk/MgDev/Oem/SWIGEx/Makefile	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Oem/SWIGEx/Makefile	2012-04-11 15:07:14 UTC (rev 6568)
@@ -12,8 +12,8 @@
 CXX      = g++
 LEX      = flex
 YACC     = yacc
-CFLAGS   = -pipe -UZTS -Wall -W -O2 -g -pipe -march=i386 -mcpu=i686 -fno-use-cxa-atexit -fexceptions  -DNDEBUG
-CXXFLAGS = -pipe -UZTS -Wall -W -O2 -g -pipe -march=i386 -mcpu=i686 -fno-use-cxa-atexit -fexceptions  -DNDEBUG
+CFLAGS   = -pipe -UZTS -Wall -W -O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions  -DNDEBUG
+CXXFLAGS = -pipe -UZTS -Wall -W -O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions  -DNDEBUG
 LEXFLAGS = 
 YACCFLAGS= -d
 INCPATH  = -I$(QTDIR)/mkspecs/default -I. -ISource/CParse -ISource/DOH -ISource/Include -ISource/Swig -ISource/Modules -ISource/Preprocessor
@@ -221,7 +221,6 @@
 lexclean:
 clean:
 	-$(DEL_FILE) $(OBJECTS) 
-	-$(DEL_FILE) Makefile
 	-$(DEL_FILE) *~ core *.core
 
 

Modified: trunk/MgDev/Oem/dbxml/xqilla/Makefile.in
===================================================================
--- trunk/MgDev/Oem/dbxml/xqilla/Makefile.in	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Oem/dbxml/xqilla/Makefile.in	2012-04-11 15:07:14 UTC (rev 6568)
@@ -5373,7 +5373,6 @@
 
 
 $(LEXERFILE): $(LEXTEMPLATE) $(LEXSKEL)
-	$(LEX) -BUs -Pxq -S$(LEXSKEL) -o$(LEXERFILE) $(LEXTEMPLATE) # This can take a long time
 
 $(PARSERCPP) $(PARSERHPP): $(PARSERFILE)
 	$(YACC) -d -v -o $(PARSERCPP) $(PARSERFILE)

Modified: trunk/MgDev/Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp
===================================================================
--- trunk/MgDev/Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp	2012-04-11 15:07:14 UTC (rev 6568)
@@ -24,6 +24,7 @@
 
 #include <algorithm>
 #include <assert.h>
+#include <cstddef>
 
 #include <xqilla/framework/XQillaExport.hpp>
 

Modified: trunk/MgDev/Oem/geos-2.2.0/configure.in
===================================================================
--- trunk/MgDev/Oem/geos-2.2.0/configure.in	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Oem/geos-2.2.0/configure.in	2012-04-11 15:07:14 UTC (rev 6568)
@@ -47,10 +47,6 @@
 dnl types checks ------------------------------------------------------
 
 dnl Find a working 64bit integer
-PGAC_TYPE_64BIT_INT([long int])
-if test x"$HAVE_LONG_INT_64" = x"no" ; then
-  PGAC_TYPE_64BIT_INT([long long int])
-fi
 
 dnl function checks ------------------------------------------------------
 AC_FUNC_CLOSEDIR_VOID
@@ -77,7 +73,21 @@
 dnl check for libraries ---------------------------------------------------
 
 dnl things to substitute in output ----------------------------------------
-AC_SUBST(VERSION VERSION_MAJOR VERSION_MINOR VERSION_PATCH INTERFACE_CURRENT INTERFACE_REVISION INTERFACE_AGE JTS_PORT CAPI_VERSION CAPI_VERSION_MAJOR CAPI_VERSION_MINOR CAPI_VERSION_PATCH CAPI_INTERFACE_CURRENT CAPI_INTERFACE_REVISION CAPI_INTERFACE_AGE)
+AC_SUBST(VERSION) 
+AC_SUBST(VERSION_MAJOR)
+AC_SUBST(VERSION_MINOR)
+AC_SUBST(VERSION_PATCH)
+AC_SUBST(INTERFACE_CURRENT)
+AC_SUBST(INTERFACE_REVISION)
+AC_SUBST(INTERFACE_AGE)
+AC_SUBST(JTS_PORT)
+AC_SUBST(CAPI_VERSION)
+AC_SUBST(CAPI_VERSION_MAJOR)
+AC_SUBST(CAPI_VERSION_MINOR)
+AC_SUBST(CAPI_VERSION_PATCH)
+AC_SUBST(CAPI_INTERFACE_CURRENT)
+AC_SUBST(CAPI_INTERFACE_REVISION)
+AC_SUBST(CAPI_INTERFACE_AGE)
 
 dnl output stuff ----------------------------------------------------------
 

Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp	2012-04-11 15:07:14 UTC (rev 6568)
@@ -24,8 +24,8 @@
 #include "stdafx.h"
 #include "GwsQueryEngineImp.h"
 #include "GwsBinaryFeatureWriter.h"
+#include <cstdio>
 
-
 // This setting limits the batch size used by the join algorithm
 int CGwsBatchSortedBlockJoinQueryResults::sm_nBatchSize = 100; //Default
 

Modified: trunk/MgDev/Web/src/CgiAgent/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/CgiAgent/Makefile.am	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/Web/src/CgiAgent/Makefile.am	2012-04-11 15:07:14 UTC (rev 6568)
@@ -37,14 +37,17 @@
                  -lMgFoundation \
                  -lMgGeometry \
                  -lMgPlatformBase \
+                 -lMgMapGuideCommon \
                  -lMgMdfModel \
                  -lMgMdfParser \
                  -lMgHttpHandler \
-                 -lMgWebSupport
+                 -lMgWebSupport \
+                 -llib_json
 
 mapagent_LDFLAGS = \
             -L../../../Oem/ACE/ACE_wrappers/ace \
             -L../../../Oem/dbxml/install/lib \
+            -L../../../Oem/jsoncpp/lib \
             -L../../../Common/CoordinateSystem \
             -L../../../Common/MdfModel \
             -L../../../Common/MdfParser \

Modified: trunk/MgDev/configure.in
===================================================================
--- trunk/MgDev/configure.in	2012-04-11 12:34:12 UTC (rev 6567)
+++ trunk/MgDev/configure.in	2012-04-11 15:07:14 UTC (rev 6568)
@@ -4,7 +4,7 @@
 # Variables
 # Following are the makefile directories
 #----------------------------------------------------------------------
-AC_INIT(mapguide,2.2.0,http://mapguide.osgeo.org)
+AC_INIT(mapguide,2.4.0,http://mapguide.osgeo.org)
 AC_CONFIG_SRCDIR(configure.in)
 AM_INIT_AUTOMAKE
 AM_INIT_AUTOMAKE([1.9 tar-pax])
@@ -135,12 +135,12 @@
     AC_MSG_NOTICE([Using optimized configuration])
     if test -s "gcc32.txt"; then
         AC_MSG_NOTICE([gcc 3.2.x . Please pay attention to warnings!])
-        CXXFLAGS="-O2 -g -pipe -march=i386 -mcpu=i686 -fno-use-cxa-atexit -fexceptions"
-        AC_SUBST(CXXFLAGS, ["-O2 -g -pipe -march=i386 -mcpu=i686 -fno-use-cxa-atexit -fexceptions"])
+        CXXFLAGS="-O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions"
+        AC_SUBST(CXXFLAGS, ["-O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions"])
     else
         AC_MSG_NOTICE([this gcc version is not actively supported.])
-        CXXFLAGS="-O2 -g -pipe -march=i386 -mcpu=i686 -fno-use-cxa-atexit -fexceptions"
-        AC_SUBST(CXXFLAGS, ["-O2 -g -pipe -march=i386 -mcpu=i686 -fno-use-cxa-atexit -fexceptions"])
+        CXXFLAGS="-O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions"
+        AC_SUBST(CXXFLAGS, ["-O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions"])
     fi
 fi

More information about the mapguide-commits mailing list