[mapguide-commits] r9099 - in sandbox/jng/diet_v2/MgDev: . Common/Foundation Common/Geometry Common/MapGuideCommon Common/MdfParser Common/PlatformBase Common/Renderers Common/Stylization Desktop/DesktopUnmanagedApi/JavaApiEx Server/src/Common/Base Server/src/Common/Cache Server/src/Common/Manager Server/src/Common/Thread Server/src/Core Server/src/Gws/GwsCommon Server/src/Services/Drawing Server/src/Services/Feature Server/src/Services/Kml Server/src/Services/Mapping Server/src/Services/Profiling Server/src/Services/Rendering Server/src/Services/Resource Server/src/Services/ServerAdmin Server/src/Services/Site Server/src/Services/Tile Server/src/UnitTesting Web/src/ApacheAgent Web/src/CgiAgent Web/src/HttpHandler Web/src/JavaApi Web/src/JavaApiEx Web/src/PhpApi Web/src/WebApp Web/src/WebSupport
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Nov 24 04:26:23 PST 2016
Author: jng
Date: 2016-11-24 04:26:23 -0800 (Thu, 24 Nov 2016)
New Revision: 9099
Modified:
sandbox/jng/diet_v2/MgDev/Common/Foundation/Makefile.am
sandbox/jng/diet_v2/MgDev/Common/Geometry/Makefile.am
sandbox/jng/diet_v2/MgDev/Common/MapGuideCommon/Makefile.am
sandbox/jng/diet_v2/MgDev/Common/MdfParser/Makefile.am
sandbox/jng/diet_v2/MgDev/Common/PlatformBase/Makefile.am
sandbox/jng/diet_v2/MgDev/Common/Renderers/Makefile.am
sandbox/jng/diet_v2/MgDev/Common/Stylization/Makefile.am
sandbox/jng/diet_v2/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Common/Base/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Common/Cache/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Common/Manager/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Common/Thread/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Core/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Gws/GwsCommon/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Services/Drawing/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Services/Feature/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Services/Kml/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Services/Mapping/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Services/Profiling/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Services/Rendering/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Services/Resource/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Services/ServerAdmin/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Services/Site/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/Services/Tile/Makefile.am
sandbox/jng/diet_v2/MgDev/Server/src/UnitTesting/Makefile.am
sandbox/jng/diet_v2/MgDev/Web/src/ApacheAgent/Makefile.am
sandbox/jng/diet_v2/MgDev/Web/src/CgiAgent/Makefile.am
sandbox/jng/diet_v2/MgDev/Web/src/HttpHandler/Makefile.am
sandbox/jng/diet_v2/MgDev/Web/src/JavaApi/Makefile.am
sandbox/jng/diet_v2/MgDev/Web/src/JavaApiEx/Makefile.am
sandbox/jng/diet_v2/MgDev/Web/src/PhpApi/Makefile.am
sandbox/jng/diet_v2/MgDev/Web/src/WebApp/Makefile.am
sandbox/jng/diet_v2/MgDev/Web/src/WebSupport/Makefile.am
sandbox/jng/diet_v2/MgDev/configure.in
Log:
Bring across expanded configure.in and parameterized Makefile.am changes from original diet branch
Modified: sandbox/jng/diet_v2/MgDev/Common/Foundation/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Common/Foundation/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Common/Foundation/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -230,8 +230,8 @@
-ISystem \
-I../Security \
-I../MdfModel \
- -I../../Oem/ACE/ACE_wrappers \
- -I../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
libMgFoundation_la_LIBADD = \
-lACE \
@@ -240,7 +240,7 @@
-lxerces-c
libMgFoundation_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../Oem/ACE/ACE_wrappers/ace \
- -L../../Oem/dbxml/install/lib \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
+ -L$(mg_oem_dbxml_src)/install/lib \
-L../MdfParser \
-L../MdfModel
Modified: sandbox/jng/diet_v2/MgDev/Common/Geometry/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Common/Geometry/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Common/Geometry/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -444,21 +444,21 @@
-I../MdfModel \
-I../Foundation \
-I../Geometry \
- -I../../Oem/ACE/ACE_wrappers \
- -I../../Oem/geos/include \
- -I../../Oem/dbxml/xerces-c-src/src \
- -I../../Oem/CsMap/Include \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_geos_src)/include \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
+ -I$(mg_oem_csmap_src)/Include \
-I../../Common/CoordinateSystem
libMgGeometry_la_LIBADD = \
-lACE \
-lMgFoundation \
- ../../Oem/CsMap/.libs/libCsmap.a \
- ../../Oem/geos/src/.libs/libgeos.a
+ $(mg_oem_csmap_src)/.libs/libCsmap.a \
+ $(mg_oem_geos_src)/src/.libs/libgeos.a
libMgGeometry_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../Foundation \
- -L../../Oem/CsMap \
+ -L$(mg_oem_csmap_src) \
-L../../Common/CoordinateSystem
Modified: sandbox/jng/diet_v2/MgDev/Common/MapGuideCommon/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Common/MapGuideCommon/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Common/MapGuideCommon/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -272,9 +272,9 @@
-I../MdfModel \
-I../Foundation \
-I../Geometry \
- -I../../Oem/ACE/ACE_wrappers \
- -I../../Oem/geos/source/headers \
- -I../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_geos_src)/source/headers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
libMgMapGuideCommon_la_LIBADD = \
-lACE \
@@ -286,7 +286,7 @@
-lMgSecurity
libMgMapGuideCommon_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../PlatformBase \
-L../Foundation \
-L../Geometry \
Modified: sandbox/jng/diet_v2/MgDev/Common/MdfParser/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Common/MdfParser/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Common/MdfParser/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -4,7 +4,7 @@
INCLUDES = \
-I../MdfModel/ \
- -I../../Oem/dbxml/xerces-c-src/src/
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src/
lib_LTLIBRARIES = libMgMdfParser.la
@@ -242,4 +242,4 @@
libMgMdfParser_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-L../MdfModel \
- -L../../Oem/dbxml/install/lib
+ -L$(mg_oem_dbxml_src)/install/lib
Modified: sandbox/jng/diet_v2/MgDev/Common/PlatformBase/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Common/PlatformBase/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Common/PlatformBase/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -249,9 +249,9 @@
-I../MdfModel \
-I../Foundation \
-I../Geometry \
- -I../../Oem/ACE/ACE_wrappers \
- -I../../Oem/geos/source/headers \
- -I../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_geos_src)source/headers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
libMgPlatformBase_la_LIBADD = \
-lACE \
@@ -261,7 +261,7 @@
-lMgGeometry
libMgPlatformBase_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../Foundation \
-L../Geometry \
-L../../Common/CoordinateSystem \
Modified: sandbox/jng/diet_v2/MgDev/Common/Renderers/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Common/Renderers/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Common/Renderers/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -7,11 +7,11 @@
-I../Stylization/ \
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
- -I../../Oem/DWFTK/develop/global/src/ \
- -I../../Oem/DWFTK/develop/global/src/dwf/ \
- -I../../Oem/gd/gd/ \
- -I../../Oem/gd/lpng \
- -I../../Oem/gd/freetype/include/ \
+ -I$(mg_oem_dwftk_src)/develop/global/src/ \
+ -I$(mg_oem_dwftk_src)/develop/global/src/dwf/ \
+ -I$(mg_oem_gd_src)/ \
+ -I$(mg_oem_libpng_src)/ \
+ -I$(mg_oem_freetype_src)/include/ \
-I../../Oem/agg-2.4/include \
-I../../Oem/agg-2.4/font_freetype
@@ -82,14 +82,14 @@
AM_CXXFLAGS = @CXXFLAGS@ -DDWFTK_BUILD_EXPAT
libMgRenderers_la_LIBADD = \
- ../../Oem/gd/gd/.libs/libgd.a \
- ../../Oem/gd/freetype/objs/.libs/libfreetype.a \
- ../../Oem/gd/jpeg/.libs/libjpeg.a \
- ../../Oem/gd/lpng/libpng.a \
+ $(mg_oem_gd_src)/.libs/libgd.a \
+ $(mg_oem_freetype_src)/objs/.libs/libfreetype.a \
+ $(mg_oem_libjpeg_src)/.libs/libjpeg.a \
+ $(mg_oem_libpng_src)/libpng.a \
../../Oem/agg-2.4/src/libagg.a \
-ldwfcore \
-ldwftk
libMgRenderers_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../Oem/DWFTK/develop/global/src/dwfcore/.libs \
- -L../../Oem/DWFTK/develop/global/src/dwf/.libs
+ -L$(mg_oem_dwftk_src)/develop/global/src/dwfcore/.libs \
+ -L$(mg_oem_dwftk_src)/develop/global/src/dwf/.libs
Modified: sandbox/jng/diet_v2/MgDev/Common/Stylization/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Common/Stylization/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Common/Stylization/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -7,7 +7,7 @@
-I../Foundation \
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
- -I../../Oem/ACE/ACE_wrappers
+ -I$(mg_oem_ace_src)/ACE_wrappers
lib_LTLIBRARIES = libMgStylization.la
Modified: sandbox/jng/diet_v2/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -18,11 +18,11 @@
-I../../../Common/MapGuideCommon \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
- -I../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../HttpHandler \
-I../WebSupport \
-I../WebApp \
- -I../../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
BUILT_SOURCES = MgApi_wrap.cpp
@@ -45,7 +45,7 @@
-lMgWebApp
libMapGuideJavaApiEx_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
-L../../../Common/Foundation \
@@ -54,7 +54,7 @@
-L../../../Common/MapGuideCommon \
-L../HttpHandler \
-L../WebApp \
- -L../../../Oem/dbxml/install/lib
+ -L$(mg_oem_dbxml_src)/install/lib
MgApi_wrap.cpp : \
../WebApp/WebApp.h \
@@ -457,10 +457,10 @@
../HttpHandler/HttpRequestParam.h \
../HttpHandler/HttpResponse.h \
../HttpHandler/HttpResult.h
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
cp -f java.i language.i
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml Java .
- ../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/Constants.xml Java .
+ $(mg_oem_swig_src)/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib $(mg_oem_swig_src)/Lib MapGuideApi.i
rm -f org/osgeo/mapguide/*.class
mv -f *.java org/osgeo/mapguide
$(JAVA_HOME)/bin/javac -classpath . org/osgeo/mapguide/*.java
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Common/Base/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Common/Base/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Common/Base/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -5,7 +5,7 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../../../../Common/MdfModel \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Common/Cache/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Common/Cache/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Common/Cache/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -10,7 +10,7 @@
-I../../../../Common/MapGuideCommon \
-I../../../../Common/Geometry \
-I../../../../Common/MdfModel \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I$(map_fdo_include)
lib_LTLIBRARIES = libMgServerCache.la
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Common/Manager/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Common/Manager/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Common/Manager/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -5,9 +5,9 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I$(map_fdo_include) \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../../../Common \
-I../../../../Common/Security \
-I../../../../Common/Foundation \
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Common/Thread/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Common/Thread/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Common/Thread/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -5,7 +5,7 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/MapGuideCommon \
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Core/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Core/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Core/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -2,14 +2,14 @@
EXTRA_DIST = serverconfig.ini ServerCore.vcproj ServerCore.rc
mentor_dict_install_dir=@prefix@/share/gis/coordsys
-mentor_dict_source_dir=$(map_srcdir)/Oem/CsMap/Dictionaries
+mentor_dict_source_dir=$(mg_oem_csmap_src)/Dictionaries
root_prefix=@prefix@
prefix=@prefix@/server
INCLUDES = \
- -I../../../Oem/ACE/ACE_wrappers \
- -I../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I $(map_fdo_include) \
-I $(map_fdo_include)/ExpressionEngine \
-I../Common \
@@ -32,7 +32,7 @@
-I../../../Common/Geometry \
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
- -I../../../Oem/gd/freetype/include \
+ -I$(mg_oem_freetype_src)/include \
-I../../../Common/MdfModel \
-I../../../Common/MdfParser \
-I../../../Common/Stylization \
@@ -131,10 +131,11 @@
mgserver_LDFLAGS = \
-R$(map_fdo_lib) \
- -R$(map_srcdir)/Oem/ACE/ACE_wrappers/ace \
- -R$(map_srcdir)/Oem/DWFTK/develop/global/src/dwfcore \
- -R$(map_srcdir)/Oem/DWFTK/develop/global/src/dwf \
- -R$(map_srcdir)/Oem/dbxml/install/lib \
+ -R$(mg_oem_ace_src)/ACE_wrappers/ace \
+ -R$(mg_oem_dwftk_src)/develop/global/src/dwfcore/.libs \
+ -R$(mg_oem_dwftk_src)/develop/global/src/dwf/.libs \
+ -R$(mg_oem_dbxml_src)/install/lib \
+ -R$(mg_oem_cppunit_src)/src/cppunit/.libs \
-R$(map_srcdir)/Common/CoordinateSystem/.libs \
-R$(map_srcdir)/Common/MdfModel/.libs \
-R$(map_srcdir)/Common/MdfParser/.libs \
@@ -160,10 +161,10 @@
-R$(map_srcdir)/Server/src/Services/Tile/.libs \
-R$(map_srcdir)/Server/src/$(map_unittesting_dir)/.libs \
-L$(map_fdo_lib) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
- -L../../../Oem/DWFTK/develop/global/src/dwfcore \
- -L../../../Oem/DWFTK/develop/global/src/dwf \
- -L../../../Oem/dbxml/install/lib \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
+ -L$(mg_oem_dwftk_src)/develop/global/src/dwfcore/.libs \
+ -L$(mg_oem_dwftk_src)/develop/global/src/dwf/.libs \
+ -L$(mg_oem_dbxml_src)/install/lib \
-L$(top_builddir)/Common/CoordinateSystem \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
@@ -396,17 +397,17 @@
test -d $(mentor_dict_install_dir) || ($(mkinstalldirs) $(mentor_dict_install_dir); \
cp -f -r $(mentor_dict_source_dir)/* $(mentor_dict_install_dir);)
@cp -fp ../../../Common/Schema/*.xsd $(schemadir)
- @cp -fp ../../../Oem/dbxml/install/bin/db_archive ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_checkpoint ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_dump ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_hotbackup ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_load ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_recover ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_upgrade ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_verify ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/dbxml ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/dbxml_dump ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/dbxml_load ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_archive ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_checkpoint ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_dump ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_hotbackup ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_load ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_recover ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_upgrade ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_verify ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/dbxml ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/dbxml_dump ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/dbxml_load ${prefix}/bin/
@cp -fp ../../RepositoryAdmin/*.sh $(repositoryadmindir)
@cp -fp ../../RepositoryAdmin/*.php $(repositoryadmindir)
@cp -fp ../../RepositoryAdmin/*.inc $(repositoryadmindir)
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Gws/GwsCommon/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Gws/GwsCommon/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Gws/GwsCommon/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -40,7 +40,7 @@
-I../Include \
-I../GwsResource \
-I./inc \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Services/Drawing/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Services/Drawing/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Services/Drawing/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -5,15 +5,15 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../../../../Common/MdfModel \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
-I../../../../Common/MapGuideCommon \
- -I../../../../Oem/DWFTK/develop/global/src \
- -I../../../../Oem/DWFTK/develop/global/src/dwf \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_dwftk_src)/develop/global/src \
+ -I$(mg_oem_dwftk_src)/develop/global/src/dwf \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../Common \
-I../../Common/Base \
-I../../Common/Manager \
@@ -67,7 +67,7 @@
libMgServerDrawingService_la_LIBADD = -lMgFoundation -lMgGeometry -lMgPlatformBase -lMgMapGuideCommon -lxerces-c
libMgServerDrawingService_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../../Oem/dbxml/install/lib \
+ -L$(mg_oem_dbxml_src)/install/lib \
-L../../../../Common/Foundation \
-L../../../../Common/Geometry \
-L../../../../Common/PlatformBase \
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Services/Feature/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Services/Feature/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Services/Feature/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -7,8 +7,8 @@
INCLUDES = \
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../Gws/Include \
-I../../Gws/GwsCommon/inc \
-I../../Gws/GwsQueryEngine/inc \
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Services/Kml/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Services/Kml/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Services/Kml/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -5,9 +5,9 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml/xerces-c-src/src \
- -I../../../../Oem/DWFTK/develop/global/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
+ -I$(mg_oem_dwftk_src)/develop/global/src \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Services/Mapping/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Services/Mapping/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Services/Mapping/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -5,7 +5,7 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../../../../Common/Stylization \
-I../../../../Common/Renderers \
-I../../Common \
@@ -16,7 +16,7 @@
-I../../../../Common/MdfParser \
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../../../Common/CoordinateSystem \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Services/Profiling/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Services/Profiling/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Services/Profiling/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -5,8 +5,8 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Services/Rendering/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Services/Rendering/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Services/Rendering/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -7,8 +7,8 @@
INCLUDES = \
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Services/Resource/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Services/Resource/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Services/Resource/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -5,13 +5,13 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I$(map_fdo_include) \
- -I../../../../Oem/dbxml/xerces-c-src/src \
- -I../../../../Oem/dbxml/install/include \
- -I../../../../Oem/dbxml/dbxml/include \
- -I../../../../Oem/dbxml/dbxml/src \
- -I../../../../Oem/DWFTK/develop/global/src \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
+ -I$(mg_oem_dbxml_src)/install/include \
+ -I$(mg_oem_dbxml_src)/dbxml/include \
+ -I$(mg_oem_dbxml_src)/dbxml/src \
+ -I$(mg_oem_dwftk_src)/develop/global/src \
-I../../../../Common/Security \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
@@ -211,4 +211,4 @@
-L../../Common/Base \
-L../../Common/Cache \
-L../../Common/Manager \
- -L../../../../Oem/dbxml/install/lib
+ -L$(mg_oem_dbxml_src)/install/lib
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Services/ServerAdmin/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Services/ServerAdmin/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Services/ServerAdmin/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -5,7 +5,7 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../../../../Common/MdfModel \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Services/Site/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Services/Site/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Services/Site/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -11,8 +11,8 @@
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
-I../../../../Common/MapGuideCommon \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../Common \
-I../../Common/Base \
-I../../Common/Manager \
Modified: sandbox/jng/diet_v2/MgDev/Server/src/Services/Tile/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/Services/Tile/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/Services/Tile/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -5,8 +5,8 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
Modified: sandbox/jng/diet_v2/MgDev/Server/src/UnitTesting/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Server/src/UnitTesting/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Server/src/UnitTesting/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -5,9 +5,9 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../Oem/ACE/ACE_wrappers \
- -I../../../Oem/CppUnit-1.9.14/include \
- -I../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_cppunit_src)/include \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../../Common/Foundation \
-I../../../Common/Geometry \
-I../../../Common/PlatformBase \
@@ -78,4 +78,4 @@
libMgUnitTesting_la_LIBADD = -lcppunit
libMgUnitTesting_la_LDFLAGS = -rpath /createshared -release $(PACKAGE_VERSION) \
- -L../../../Oem/CppUnit-1.9.14/src/cppunit
+ -L$(mg_oem_cppunit_src)/src/cppunit/.libs
Modified: sandbox/jng/diet_v2/MgDev/Web/src/ApacheAgent/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Web/src/ApacheAgent/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Web/src/ApacheAgent/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -9,7 +9,7 @@
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
-I../../../Common/MdfModel \
- -I../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I$(httpd_src)/include \
-I$(httpd_src)/srclib/apr/include \
-I$(httpd_src)/srclib/apr-util/include \
@@ -47,8 +47,8 @@
-lMgWebSupport
mod_mgmapagent_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
- -L../../../Oem/dbxml/install/lib \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
+ -L$(mg_oem_dbxml_src)/install/lib \
-L../../../Common/CoordinateSystem \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
Modified: sandbox/jng/diet_v2/MgDev/Web/src/CgiAgent/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Web/src/CgiAgent/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Web/src/CgiAgent/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -9,7 +9,7 @@
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
-I../../../Common/MdfModel \
- -I../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../HttpHandler \
-I../WebSupport \
-I../MapAgentCommon
@@ -47,9 +47,9 @@
-llib_json
mapagent_LDFLAGS = \
- -L../../../Oem/ACE/ACE_wrappers/ace \
- -L../../../Oem/dbxml/install/lib \
- -L../../../Oem/jsoncpp/lib \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
+ -L$(mg_oem_dbxml_src)/install/lib \
+ -L$(mg_oem_jsoncpp_src)/lib \
-L../../../Common/CoordinateSystem \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
Modified: sandbox/jng/diet_v2/MgDev/Web/src/HttpHandler/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Web/src/HttpHandler/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Web/src/HttpHandler/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -9,9 +9,9 @@
-I../../../Common/Geometry \
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
- -I../../../Oem/ACE/ACE_wrappers \
- -I../../../Oem/dbxml/xerces-c-src/src \
- -I../../../Oem/jsoncpp/include
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
+ -I$(mg_oem_jsoncpp_src)/include
lib_LTLIBRARIES = libMgHttpHandler.la
@@ -293,6 +293,6 @@
-L../../../Common/Geometry \
-L../../../Common/PlatformBase \
-L../../../Common/MapGuideCommon \
- -L../../../Oem/jsoncpp/lib \
+ -L$(mg_oem_jsoncpp_src)/lib \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser
Modified: sandbox/jng/diet_v2/MgDev/Web/src/JavaApi/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Web/src/JavaApi/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Web/src/JavaApi/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -18,11 +18,11 @@
-I../../../Common/MapGuideCommon \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
- -I../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../HttpHandler \
-I../WebSupport \
-I../WebApp \
- -I../../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
BUILT_SOURCES = MgApi_wrap.cpp
@@ -45,7 +45,7 @@
-lMgWebApp
libMapGuideJavaApi_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
-L../../../Common/Foundation \
@@ -54,7 +54,7 @@
-L../../../Common/MapGuideCommon \
-L../HttpHandler \
-L../WebApp \
- -L../../../Oem/dbxml/install/lib
+ -L$(mg_oem_dbxml_src)/install/lib
MgApi_wrap.cpp : \
../WebApp/WebApp.h \
@@ -457,10 +457,10 @@
../HttpHandler/HttpRequestParam.h \
../HttpHandler/HttpResponse.h \
../HttpHandler/HttpResult.h
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
cp -f java.i language.i
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml Java .
- ../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApi -c++ -java -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/Constants.xml Java .
+ $(mg_oem_swig_src)/Linux/swig -dllname MapGuideJavaApi -c++ -java -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib $(mg_oem_swig_src)/Lib MapGuideApi.i
rm -f org/osgeo/mapguide/*.class
mv -f *.java org/osgeo/mapguide
$(JAVA_HOME)/bin/javac -classpath . org/osgeo/mapguide/*.java
Modified: sandbox/jng/diet_v2/MgDev/Web/src/JavaApiEx/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Web/src/JavaApiEx/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Web/src/JavaApiEx/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -18,11 +18,11 @@
-I../../../Common/MapGuideCommon \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
- -I../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../HttpHandler \
-I../WebSupport \
-I../WebApp \
- -I../../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
BUILT_SOURCES = MgApi_wrap.cpp
@@ -45,7 +45,7 @@
-lMgWebApp
libMapGuideJavaApiEx_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
-L../../../Common/Foundation \
@@ -54,7 +54,7 @@
-L../../../Common/MapGuideCommon \
-L../HttpHandler \
-L../WebApp \
- -L../../../Oem/dbxml/install/lib
+ -L$(mg_oem_dbxml_src)/install/lib
MgApi_wrap.cpp : \
../WebApp/WebApp.h \
@@ -457,10 +457,10 @@
../HttpHandler/HttpRequestParam.h \
../HttpHandler/HttpResponse.h \
../HttpHandler/HttpResult.h
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
cp -f java.i language.i
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml Java .
- ../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/Constants.xml Java .
+ $(mg_oem_swig_src)/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib $(mg_oem_swig_src)/Lib MapGuideApi.i
rm -f org/osgeo/mapguide/*.class
mv -f *.java org/osgeo/mapguide
$(JAVA_HOME)/bin/javac -classpath . org/osgeo/mapguide/*.java
Modified: sandbox/jng/diet_v2/MgDev/Web/src/PhpApi/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Web/src/PhpApi/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Web/src/PhpApi/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -18,11 +18,11 @@
-I$(php_src)/Zend \
-I$(php_src)/main \
-I$(php_src) \
- -I../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../HttpHandler \
-I../WebSupport \
-I../WebApp \
- -I../../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
lib_LTLIBRARIES = libphp_MapGuideApi.la
@@ -43,7 +43,7 @@
-lMgWebApp
libphp_MapGuideApi_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
-L../../../Common/Foundation \
@@ -52,7 +52,7 @@
-L../../../Common/MapGuideCommon \
-L../HttpHandler \
-L../WebApp \
- -L../../../Oem/dbxml/install/lib
+ -L$(mg_oem_dbxml_src)/install/lib
MgApi_wrap.cpp : \
../WebApp/WebApp.h \
@@ -455,14 +455,14 @@
../HttpHandler/HttpRequestParam.h \
../HttpHandler/HttpResponse.h \
../HttpHandler/HttpResult.h
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml PHP ./constants.php
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/Constants.xml PHP ./constants.php
cp -f php.i language.i
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml PHP
- ../../../Oem/SWIGEx/Linux/swig -c++ -php -DPHPSWIG -baseexception MgException \
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml PHP
+ $(mg_oem_swig_src)/Linux/swig -c++ -php -DPHPSWIG -baseexception MgException \
-clsidcode getclassid.code \
-clsiddata m_cls_id \
-catchallcode catchall.code \
-dispose "((MgDisposable*)arg1)->Release()" \
-rethrow "e->Raise();" \
-nodefault -o MgApi_wrap.cpp \
- -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
+ -lib $(mg_oem_swig_src)/Lib MapGuideApi.i
Modified: sandbox/jng/diet_v2/MgDev/Web/src/WebApp/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Web/src/WebApp/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Web/src/WebApp/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -79,13 +79,13 @@
-I../../../Common/Geometry \
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
- -I../../../Oem/dbxml/xerces-c-src/src \
- -I../../../Oem/ACE/ACE_wrappers
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers
libMgWebApp_la_LIBADD = -lxerces-c -lMgFoundation -lMgGeometry -lMgPlatformBase -lMgMapGuideCommon
libMgWebApp_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/dbxml/install/lib \
+ -L$(mg_oem_dbxml_src)/install/lib \
-L../../../Common/Foundation \
-L../../../Common/Geometry \
-L../../../Common/PlatformBase \
Modified: sandbox/jng/diet_v2/MgDev/Web/src/WebSupport/Makefile.am
===================================================================
--- sandbox/jng/diet_v2/MgDev/Web/src/WebSupport/Makefile.am 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/Web/src/WebSupport/Makefile.am 2016-11-24 12:26:23 UTC (rev 9099)
@@ -11,7 +11,7 @@
-I../../../Common/Geometry \
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
- -I../../../Oem/ACE/ACE_wrappers
+ -I$(mg_oem_ace_src)/ACE_wrappers
libMgWebSupport_la_SOURCES = InitializeWebTier.cpp
Modified: sandbox/jng/diet_v2/MgDev/configure.in
===================================================================
--- sandbox/jng/diet_v2/MgDev/configure.in 2016-11-24 12:12:39 UTC (rev 9098)
+++ sandbox/jng/diet_v2/MgDev/configure.in 2016-11-24 12:26:23 UTC (rev 9099)
@@ -39,6 +39,329 @@
map_opt_oem_distsubdirs=""
dnl *******************************************************
+dnl Oem root configuration
+dnl *******************************************************
+AC_ARG_WITH([oem],
+ MAP_HELP_STRING([--with-oem],
+ [specify root path of oem components [[default=no]]]),
+ [with_oem=$withval],
+ [with_oem=no])
+
+if test $with_oem = "no"; then
+ AC_MSG_WARN([--with-oem not specified. Assuming each required component is passed in the configure script. If anything goes wrong, it's probably because of this])
+else
+ AC_MSG_NOTICE([Using oem component root path of $with_oem. All component paths will be implicitly be based from this path unless overridden individually])
+fi
+
+dnl *******************************************************
+dnl ACE 6.2.6 Configuration
+dnl *******************************************************
+AC_ARG_WITH([ace],
+ MAP_HELP_STRING([--with-ace],
+ [specify ACE source dir prefix as args [[default=no]]]),
+ [with_ace=$withval],
+ [with_ace=no])
+
+if test $with_ace == "no"; then
+ mg_oem_ace_src=$with_oem/ACE
+else
+ mg_oem_ace_src=$with_ace
+fi
+AC_MSG_NOTICE([Using ACE source dir: $mg_oem_ace_src])
+if test -d $mg_oem_ace_src; then
+ AC_MSG_NOTICE([ACE source directory is: $mg_oem_ace_src])
+else
+ AC_MSG_ERROR([ACE source directory ($mg_oem_ace_src) does not exist])
+fi
+AC_SUBST(mg_oem_ace_src)
+
+dnl *******************************************************
+dnl DWF Toolkit 7.7 Configuration
+dnl *******************************************************
+AC_ARG_WITH([dwftk],
+ MAP_HELP_STRING([--with-dwftk],
+ [specify DWF Toolkit source dir prefix as args [[default=no]]]),
+ [with_dwftk=$withval],
+ [with_dwftk=no])
+
+if test $with_dwftk == "no"; then
+ mg_oem_dwftk_src=$with_oem/DWFTK
+else
+ mg_oem_dwftk_src=$with_dwftk
+fi
+AC_MSG_NOTICE([Using DWF Toolkit source dir: $mg_oem_dwftk_src])
+if test -d $mg_oem_dwftk_src; then
+ AC_MSG_NOTICE([DWF Toolkit source directory is: $mg_oem_dwftk_src])
+else
+ AC_MSG_ERROR([DWF Toolkit source directory ($mg_oem_dwftk_src) does not exist])
+fi
+AC_SUBST(mg_oem_dwftk_src)
+
+dnl *******************************************************
+dnl GEOS 3.4.2 configuration
+dnl *******************************************************
+AC_ARG_WITH([geos],
+ MAP_HELP_STRING([--with-geos],
+ [specify GEOS source dir prefix as args [[default=no]]]),
+ [with_geos=$withval],
+ [with_geos=no])
+
+if test $with_geos == "no"; then
+ mg_oem_geos_src=$with_oem/geos
+else
+ mg_oem_geos_src=$with_geos
+fi
+AC_MSG_NOTICE([Using GEOS source dir: $mg_oem_geos_src])
+if test -d $mg_oem_geos_src; then
+ AC_MSG_NOTICE([GEOS source directory is: $mg_oem_geos_src])
+else
+ AC_MSG_ERROR([GEOS source directory ($mg_oem_geos_src) does not exist])
+fi
+AC_SUBST(mg_oem_geos_src)
+
+dnl *******************************************************
+dnl SWIGEx configuration
+dnl *******************************************************
+AC_ARG_WITH([swig],
+ MAP_HELP_STRING([--with-swig],
+ [specify SWIG source dir prefix as args [[default=no]]]),
+ [with_swig=$withval],
+ [with_swig=no])
+
+if test $with_swig == "no"; then
+ mg_oem_swig_src=$with_oem/SWIGEx
+else
+ mg_oem_swig_src=$with_swig
+fi
+AC_MSG_NOTICE([Using SWIG source dir: $mg_oem_swig_src])
+if test -d $mg_oem_swig_src; then
+ AC_MSG_NOTICE([SWIG source directory is: $mg_oem_swig_src])
+else
+ AC_MSG_ERROR([SWIG source directory ($mg_oem_swig_src) does not exist])
+fi
+AC_SUBST(mg_oem_swig_src)
+
+dnl *******************************************************
+dnl DBXML configuration
+dnl *******************************************************
+AC_ARG_WITH([dbxml],
+ MAP_HELP_STRING([--with-dbxml],
+ [specify DBXML source dir prefix as args [[default=no]]]),
+ [with_dbxml=$withval],
+ [with_dbxml=no])
+
+if test $with_dbxml == "no"; then
+ mg_oem_dbxml_src=$with_oem/dbxml
+else
+ mg_oem_dbxml_src=$with_dbxml
+fi
+AC_MSG_NOTICE([Using DBXML source dir: $mg_oem_dbxml_src])
+if test -d $mg_oem_dbxml_src; then
+ AC_MSG_NOTICE([DBXML source directory is: $mg_oem_dbxml_src])
+else
+ AC_MSG_ERROR([DBXML source directory ($mg_oem_dbxml_src) does not exist])
+fi
+AC_SUBST(mg_oem_dbxml_src)
+
+dnl *******************************************************
+dnl CppUnit configuration
+dnl *******************************************************
+AC_ARG_WITH([cppunit],
+ MAP_HELP_STRING([--with-cppunit],
+ [specify cppunit source dir prefix as args [[default=no]]]),
+ [with_cppunit=$withval],
+ [with_cppunit=no])
+
+if test $with_cppunit == "no"; then
+ mg_oem_cppunit_src=$with_oem/CppUnit-1.9.14
+else
+ mg_oem_cppunit_src=$with_cppunit
+fi
+AC_MSG_NOTICE([Using cppunit source dir: $mg_oem_cppunit_src])
+if test -d $mg_oem_cppunit_src; then
+ AC_MSG_NOTICE([cppunit source directory is: $mg_oem_cppunit_src])
+else
+ AC_MSG_ERROR([cppunit source directory ($mg_oem_cppunit_src) does not exist])
+fi
+AC_SUBST(mg_oem_cppunit_src)
+
+dnl *******************************************************
+dnl IMake configuration
+dnl *******************************************************
+AC_ARG_WITH([imake],
+ MAP_HELP_STRING([--with-imake],
+ [specify imake source dir prefix as args [[default=no]]]),
+ [with_imake=$withval],
+ [with_imake=no])
+
+if test $with_imake == "no"; then
+ mg_oem_imake_src=$with_oem/WebTools/IMake
+else
+ mg_oem_imake_src=$with_imake
+fi
+AC_MSG_NOTICE([Using imake source dir: $mg_oem_imake_src])
+if test -d $mg_oem_imake_src; then
+ AC_MSG_NOTICE([imake source directory is: $mg_oem_imake_src])
+else
+ AC_MSG_ERROR([imake source directory ($mg_oem_imake_src) does not exist])
+fi
+AC_SUBST(mg_oem_imake_src)
+
+dnl *******************************************************
+dnl ZLib configuration
+dnl *******************************************************
+AC_ARG_WITH([zlib],
+ MAP_HELP_STRING([--with-zlib],
+ [specify zlib source dir prefix as args [[default=no]]]),
+ [with_zlib=$withval],
+ [with_zlib=no])
+
+if test $with_zlib == "no"; then
+ mg_oem_zlib_src=$with_oem/gd/zlib
+else
+ mg_oem_zlib_src=$with_zlib
+fi
+AC_MSG_NOTICE([Using zlib source dir: $mg_oem_zlib_src])
+if test -d $mg_oem_zlib_src; then
+ AC_MSG_NOTICE([zlib source directory is: $mg_oem_zlib_src])
+else
+ AC_MSG_ERROR([zlib source directory ($mg_oem_zlib_src) does not exist])
+fi
+AC_SUBST(mg_oem_zlib_src)
+
+dnl *******************************************************
+dnl libpng configuration
+dnl *******************************************************
+AC_ARG_WITH([libpng],
+ MAP_HELP_STRING([--with-libpng],
+ [specify libpng source dir prefix as args [[default=no]]]),
+ [with_libpng=$withval],
+ [with_libpng=no])
+
+if test $with_libpng == "no"; then
+ mg_oem_libpng_src=$with_oem/gd/lpng
+else
+ mg_oem_libpng_src=$with_libpng
+fi
+AC_MSG_NOTICE([Using libpng source dir: $mg_oem_libpng_src])
+if test -d $mg_oem_libpng_src; then
+ AC_MSG_NOTICE([libpng source directory is: $mg_oem_libpng_src])
+else
+ AC_MSG_ERROR([libpng source directory ($mg_oem_libpng_src) does not exist])
+fi
+AC_SUBST(mg_oem_libpng_src)
+
+dnl *******************************************************
+dnl libjpeg configuration
+dnl *******************************************************
+AC_ARG_WITH([libjpeg],
+ MAP_HELP_STRING([--with-libjpeg],
+ [specify libjpeg source dir prefix as args [[default=no]]]),
+ [with_libjpeg=$withval],
+ [with_libjpeg=no])
+
+if test $with_libjpeg == "no"; then
+ mg_oem_libjpeg_src=$with_oem/gd/jpeg
+else
+ mg_oem_libjpeg_src=$with_libjpeg
+fi
+AC_MSG_NOTICE([Using libjpeg source dir: $mg_oem_libjpeg_src])
+if test -d $mg_oem_libjpeg_src; then
+ AC_MSG_NOTICE([libjpeg source directory is: $mg_oem_libjpeg_src])
+else
+ AC_MSG_ERROR([libjpeg source directory ($mg_oem_libjpeg_src) does not exist])
+fi
+AC_SUBST(mg_oem_libjpeg_src)
+
+dnl *******************************************************
+dnl freetype configuration
+dnl *******************************************************
+AC_ARG_WITH([freetype],
+ MAP_HELP_STRING([--with-freetype],
+ [specify freetype source dir prefix as args [[default=no]]]),
+ [with_freetype=$withval],
+ [with_freetype=no])
+
+if test $with_freetype == "no"; then
+ mg_oem_freetype_src=$with_oem/gd/freetype
+else
+ mg_oem_freetype_src=$with_freetype
+fi
+AC_MSG_NOTICE([Using freetype source dir: $mg_oem_freetype_src])
+if test -d $mg_oem_freetype_src; then
+ AC_MSG_NOTICE([freetype source directory is: $mg_oem_freetype_src])
+else
+ AC_MSG_ERROR([freetype source directory ($mg_oem_freetype_src) does not exist])
+fi
+AC_SUBST(mg_oem_freetype_src)
+
+dnl *******************************************************
+dnl gd configuration
+dnl *******************************************************
+AC_ARG_WITH([gd],
+ MAP_HELP_STRING([--with-gd],
+ [specify gd source dir prefix as args [[default=no]]]),
+ [with_gd=$withval],
+ [with_gd=no])
+
+if test $with_gd == "no"; then
+ mg_oem_gd_src=$with_oem/gd/gd
+else
+ mg_oem_gd_src=$with_gd
+fi
+AC_MSG_NOTICE([Using gd source dir: $mg_oem_gd_src])
+if test -d $mg_oem_gd_src; then
+ AC_MSG_NOTICE([gd source directory is: $mg_oem_gd_src])
+else
+ AC_MSG_ERROR([gd source directory ($mg_oem_gd_src) does not exist])
+fi
+AC_SUBST(mg_oem_gd_src)
+
+dnl *******************************************************
+dnl JSONCPP configuration
+dnl *******************************************************
+AC_ARG_WITH([jsoncpp],
+ MAP_HELP_STRING([--with-jsoncpp],
+ [specify jsoncpp source dir prefix as args [[default=no]]]),
+ [with_jsoncpp=$withval],
+ [with_jsoncpp=no])
+
+if test $with_jsoncpp == "no"; then
+ mg_oem_jsoncpp_src=$with_oem/jsoncpp
+else
+ mg_oem_jsoncpp_src=$with_jsoncpp
+fi
+AC_MSG_NOTICE([Using jsoncpp source dir: $mg_oem_jsoncpp_src])
+if test -d $mg_oem_jsoncpp_src; then
+ AC_MSG_NOTICE([jsoncpp source directory is: $mg_oem_jsoncpp_src])
+else
+ AC_MSG_ERROR([jsoncpp source directory ($mg_oem_jsoncpp_src) does not exist])
+fi
+AC_SUBST(mg_oem_jsoncpp_src)
+
+dnl *******************************************************
+dnl CS-Map configuration
+dnl *******************************************************
+AC_ARG_WITH([csmap],
+ MAP_HELP_STRING([--with-csmap],
+ [specify csmap source dir prefix as args [[default=no]]]),
+ [with_csmap=$withval],
+ [with_csmap=no])
+
+if test $with_csmap == "no"; then
+ mg_oem_csmap_src=$with_oem/CsMap
+else
+ mg_oem_csmap_src=$with_csmap
+fi
+AC_MSG_NOTICE([Using csmap source dir: $mg_oem_csmap_src])
+if test -d $mg_oem_csmap_src; then
+ AC_MSG_NOTICE([csmap source directory is: $mg_oem_csmap_src])
+else
+ AC_MSG_ERROR([csmap source directory ($mg_oem_csmap_src) does not exist])
+fi
+AC_SUBST(mg_oem_csmap_src)
+
+dnl *******************************************************
dnl PHP 5.6.23 Configuration
dnl *******************************************************
AC_ARG_WITH([php],
@@ -49,7 +372,7 @@
if test $with_php = "no"; then
AC_MSG_NOTICE([Using php 5.6.23 from included Oem Directory])
- php_src=`pwd`/Oem/LinuxApt/php-5.6.23
+ php_src=$with_oem/LinuxApt/php-5.6.23
else
AC_MSG_NOTICE([Using custom PHP source directory])
php_src=$with_php
@@ -72,7 +395,7 @@
if test $with_httpd = "no"; then
AC_MSG_NOTICE([Using httpd 2.4.18 from included Oem Directory])
- httpd_src=`pwd`/Oem/LinuxApt/httpd-2.4.18
+ httpd_src=$with_oem/LinuxApt/httpd-2.4.18
else
AC_MSG_NOTICE([Using custom httpd source directory])
httpd_src=$with_httpd
More information about the mapguide-commits
mailing list