[mapguide-commits] r8329 - in sandbox/jng/dwftk: . Common/Renderers Oem Server/src/Core Server/src/Services/Drawing Server/src/Services/Kml Server/src/Services/Resource
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Aug 10 19:43:51 PDT 2014
Author: jng
Date: 2014-08-10 19:43:51 -0700 (Sun, 10 Aug 2014)
New Revision: 8329
Modified:
sandbox/jng/dwftk/Common/Renderers/Makefile.am
sandbox/jng/dwftk/Oem/Makefile.am
sandbox/jng/dwftk/Server/src/Core/Makefile.am
sandbox/jng/dwftk/Server/src/Services/Drawing/Makefile.am
sandbox/jng/dwftk/Server/src/Services/Kml/Makefile.am
sandbox/jng/dwftk/Server/src/Services/Resource/Makefile.am
sandbox/jng/dwftk/build_oem.sh
Log:
Update DWF Toolkit build scripts/settings for Linux
Modified: sandbox/jng/dwftk/Common/Renderers/Makefile.am
===================================================================
--- sandbox/jng/dwftk/Common/Renderers/Makefile.am 2014-08-10 05:32:10 UTC (rev 8328)
+++ sandbox/jng/dwftk/Common/Renderers/Makefile.am 2014-08-11 02:43:51 UTC (rev 8329)
@@ -7,8 +7,8 @@
-I../Stylization/ \
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
- -I../../Oem/DWFTK7.1/develop/global/src/ \
- -I../../Oem/DWFTK7.1/develop/global/src/dwf/ \
+ -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/ \
@@ -91,5 +91,5 @@
-ldwftk
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/DWFTK/develop/global/src/dwfcore/.libs \
+ -L../../Oem/DWFTK/develop/global/src/dwf/.libs
Modified: sandbox/jng/dwftk/Oem/Makefile.am
===================================================================
--- sandbox/jng/dwftk/Oem/Makefile.am 2014-08-10 05:32:10 UTC (rev 8328)
+++ sandbox/jng/dwftk/Oem/Makefile.am 2014-08-11 02:43:51 UTC (rev 8329)
@@ -3,7 +3,7 @@
SUBDIRS = $(map_opt_oem_subdirs)
DIST_SUBDIRS =
-EXTRA_DIST = ACE CsMap jsoncpp CppUnit-1.9.14 dbxml DWFTK7.1 FDO/ProviderList/ServerCommunity fusion fusionMG gd agg-2.4 geos-2.2.0 jsoncpp LinuxApt php SQLite SWIGEx oem.sln
+EXTRA_DIST = ACE CsMap jsoncpp CppUnit-1.9.14 dbxml DWFTK FDO/ProviderList/ServerCommunity fusion fusionMG gd agg-2.4 geos-2.2.0 jsoncpp LinuxApt php SQLite SWIGEx oem.sln
dist-hook:
@@ -17,5 +17,5 @@
@cp -fpd dbxml/install/lib/libdb-*.so* ${prefix}/lib
@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 -fp DWFTK7.1/develop/global/src/dwf/.libs/libdwftk-* ${prefix}/lib
+ @cp -fp DWFTK/develop/global/src/dwfcore/.libs/libdwfcore-* ${prefix}/lib
+ @cp -fp DWFTK/develop/global/src/dwf/.libs/libdwftk-* ${prefix}/lib
Modified: sandbox/jng/dwftk/Server/src/Core/Makefile.am
===================================================================
--- sandbox/jng/dwftk/Server/src/Core/Makefile.am 2014-08-10 05:32:10 UTC (rev 8328)
+++ sandbox/jng/dwftk/Server/src/Core/Makefile.am 2014-08-11 02:43:51 UTC (rev 8329)
@@ -130,8 +130,8 @@
mgserver_LDFLAGS = \
-R$(map_fdo_lib) \
-R$(map_srcdir)/Oem/ACE/ACE_wrappers/ace \
- -R$(map_srcdir)/Oem/DWFTK7.1/develop/global/src/dwfcore \
- -R$(map_srcdir)/Oem/DWFTK7.1/develop/global/src/dwf \
+ -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$(map_srcdir)/Common/CoordinateSystem/.libs \
-R$(map_srcdir)/Common/MdfModel/.libs \
@@ -159,8 +159,8 @@
-R$(map_srcdir)/Server/src/$(map_unittesting_dir)/.libs \
-L$(map_fdo_lib) \
-L../../../Oem/ACE/ACE_wrappers/ace \
- -L../../../Oem/DWFTK7.1/develop/global/src/dwfcore \
- -L../../../Oem/DWFTK7.1/develop/global/src/dwf \
+ -L../../../Oem/DWFTK/develop/global/src/dwfcore \
+ -L../../../Oem/DWFTK/develop/global/src/dwf \
-L../../../Oem/dbxml/install/lib \
-L$(top_builddir)/Common/CoordinateSystem \
-L../../../Common/MdfModel \
@@ -389,7 +389,6 @@
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/DWFTK7.1/develop/global/fonts/* ${prefix}/bin/
@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/
Modified: sandbox/jng/dwftk/Server/src/Services/Drawing/Makefile.am
===================================================================
--- sandbox/jng/dwftk/Server/src/Services/Drawing/Makefile.am 2014-08-10 05:32:10 UTC (rev 8328)
+++ sandbox/jng/dwftk/Server/src/Services/Drawing/Makefile.am 2014-08-11 02:43:51 UTC (rev 8329)
@@ -11,8 +11,8 @@
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
-I../../../../Common/MapGuideCommon \
- -I../../../../Oem/DWFTK7.1/develop/global/src \
- -I../../../../Oem/DWFTK7.1/develop/global/src/dwf \
+ -I../../../../Oem/DWFTK/develop/global/src \
+ -I../../../../Oem/DWFTK/develop/global/src/dwf \
-I../../../../Oem/dbxml/xerces-c-src/src \
-I../../Common \
-I../../Common/Base \
Modified: sandbox/jng/dwftk/Server/src/Services/Kml/Makefile.am
===================================================================
--- sandbox/jng/dwftk/Server/src/Services/Kml/Makefile.am 2014-08-10 05:32:10 UTC (rev 8328)
+++ sandbox/jng/dwftk/Server/src/Services/Kml/Makefile.am 2014-08-11 02:43:51 UTC (rev 8329)
@@ -7,7 +7,7 @@
INCLUDES = \
-I../../../../Oem/ACE/ACE_wrappers \
-I../../../../Oem/dbxml/xerces-c-src/src \
- -I../../../../Oem/DWFTK7.1/develop/global/src \
+ -I../../../../Oem/DWFTK/develop/global/src \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
@@ -16,7 +16,7 @@
-I../../Common/Base \
-I../../Common/Manager \
-I$(map_fdo_include) \
- -I$(map_fdo_include)/ExpressionEngine \
+ -I$(map_fdo_include)/ExpressionEngine \
-I../../../../Common/MdfModel \
-I../../../../Common/MdfParser \
-I../../../../Common/CoordinateSystem \
Modified: sandbox/jng/dwftk/Server/src/Services/Resource/Makefile.am
===================================================================
--- sandbox/jng/dwftk/Server/src/Services/Resource/Makefile.am 2014-08-10 05:32:10 UTC (rev 8328)
+++ sandbox/jng/dwftk/Server/src/Services/Resource/Makefile.am 2014-08-11 02:43:51 UTC (rev 8329)
@@ -11,7 +11,7 @@
-I../../../../Oem/dbxml/install/include \
-I../../../../Oem/dbxml/dbxml/include \
-I../../../../Oem/dbxml/dbxml/src \
- -I../../../../Oem/DWFTK7.1/develop/global/src \
+ -I../../../../Oem/DWFTK/develop/global/src \
-I../../../../Common/Security \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
Modified: sandbox/jng/dwftk/build_oem.sh
===================================================================
--- sandbox/jng/dwftk/build_oem.sh 2014-08-10 05:32:10 UTC (rev 8328)
+++ sandbox/jng/dwftk/build_oem.sh 2014-08-11 02:43:51 UTC (rev 8329)
@@ -147,7 +147,7 @@
init_dwfcore()
{
LIB_NAME="DWFCORE 1.0"
- pushd DWFTK7.1/develop/global/build/gnu/dwfcore
+ pushd DWFTK/develop/global/build/gnu/dwfcore
if [ $CLEAN_FLAG -eq 0 ]; then
sh ./build_setup.sh
fi
@@ -156,7 +156,7 @@
build_dwfcore()
{
- pushd DWFTK7.1/develop/global/src/dwfcore
+ pushd DWFTK/develop/global/src/dwfcore
aclocal
libtoolize --copy --force
automake --add-missing --copy
@@ -173,7 +173,7 @@
clean_dwfcore()
{
- pushd DWFTK7.1/develop/global/src/dwfcore
+ pushd DWFTK/develop/global/src/dwfcore
make clean
check_clean
popd
@@ -187,7 +187,7 @@
init_dwftk()
{
LIB_NAME="DWFTK 7.1"
- pushd DWFTK7.1/develop/global/build/gnu/dwftoolkit
+ pushd DWFTK/develop/global/build/gnu/dwftoolkit
if [ $CLEAN_FLAG -eq 0 ]; then
sh ./build_setup.sh
fi
@@ -196,7 +196,7 @@
build_dwftk()
{
- pushd DWFTK7.1/develop/global/src/dwf
+ pushd DWFTK/develop/global/src/dwf
aclocal
libtoolize --copy --force
automake --add-missing --copy
@@ -213,7 +213,7 @@
clean_dwftk()
{
- pushd DWFTK7.1/develop/global/src/dwf
+ pushd DWFTK/develop/global/src/dwf
make clean
check_clean
popd
More information about the mapguide-commits
mailing list