[mapguide-commits] r5359 - in trunk/MgDev/Oem/dbxml: .
dbxml/build_windows
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Oct 28 12:09:48 EDT 2010
Author: brucedechant
Date: 2010-10-28 09:09:48 -0700 (Thu, 28 Oct 2010)
New Revision: 5359
Modified:
trunk/MgDev/Oem/dbxml/buildall.sh
trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml.vcproj
Log:
Fix for trac ticket 1398 - Upgrade to DbXml 2.5.16
Fix for trac ticket 1399 - Upgrade to Xerces 3.1.0
http://trac.osgeo.org/mapguide/ticket/1398
http://trac.osgeo.org/mapguide/ticket/1399
Implement RFC 101 - Xerces Upgrade
http://trac.osgeo.org/mapguide/wiki/MapGuideRfc101
Implement RFC 102 - DBXML and Xqilla Upgrade
http://trac.osgeo.org/mapguide/wiki/MapGuideRfc102
Notes:
- Added execution permission to generated Linux configuration file
- Update DBXML project to include ZLib dependency
Modified: trunk/MgDev/Oem/dbxml/buildall.sh
===================================================================
--- trunk/MgDev/Oem/dbxml/buildall.sh 2010-10-28 15:11:11 UTC (rev 5358)
+++ trunk/MgDev/Oem/dbxml/buildall.sh 2010-10-28 16:09:48 UTC (rev 5359)
@@ -337,6 +337,7 @@
cd $DB_DIR/build_unix
if [ $DO_CONFIGURE = "yes" ]; then
echo Configuring Berkeley DB
+ chmod +x ../dist/configure
eval $CONF_ENV ../dist/configure --prefix=$DB_INSTALL_DIR --enable-cxx \
$DB_CONF_ARGS $DB_CONF_XARGS || exit $?
fi
@@ -387,6 +388,7 @@
cd $XERCES_DIR
if [ $DO_CONFIGURE = "yes" ]; then
echo Configuring Xerces
+ chmod +x ./configure
eval $CONF_ENV ./configure --prefix=$XERCES_INSTALL_DIR \
$XERCES_CONF_ARGS $XERCES_CONF_XARGS || exit $?
fi
@@ -431,6 +433,7 @@
cd $XQILLA_BUILD_DIR
if [ $DO_CONFIGURE = "yes" ]; then
echo Configuring XQilla
+ chmod +x ../configure
eval $CONF_ENV ../configure --prefix=$XQILLA_INSTALL_DIR \
--with-xerces=$XERCESCROOT \
$XQILLA_CONF_ARGS $XQILLA_CONF_XARGS || exit $?
@@ -460,6 +463,7 @@
# Note: passing ../../$DB_DIR for --with-dbbuild will not work
# if DB_DIR is absolute. This is only used for test configuration,
# and failure to find the directory is not fatal.
+ chmod +x ../configure
eval $CONF_ENV ../configure --prefix=$DBXML_INSTALL_DIR \
--with-xqilla=$XQILLA_INSTALL_DIR \
--with-xerces=$XERCES_INSTALL_DIR \
Modified: trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml.vcproj
===================================================================
--- trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml.vcproj 2010-10-28 15:11:11 UTC (rev 5358)
+++ trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml.vcproj 2010-10-28 16:09:48 UTC (rev 5359)
@@ -78,11 +78,11 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/machine:x86"
- AdditionalDependencies="libdb48d.lib xqilla24d.lib xerces-c_3mgD.lib"
+ AdditionalDependencies="libdb48d.lib xqilla24d.lib xerces-c_3mgD.lib zlibd.lib"
OutputFile="$(OutDir)/libdbxml25d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(OutDir)";"../../db-4.8.26/build_windows/$(ConfigurationName)32";"../../xqilla/build/windows/vc8/$(ConfigurationName)32";"../../xerces-c-src/Build/$(PlatformName)/VC9/$(ConfigurationName)""
+ AdditionalLibraryDirectories=""$(OutDir)";"../../db-4.8.26/build_windows/$(ConfigurationName)32";"../../xqilla/build/windows/vc8/$(ConfigurationName)32";"../../xerces-c-src/Build/$(PlatformName)/VC9/$(ConfigurationName)";../../../gd/lpng/projects/visualc8/Win32_LIB_Debug/ZLib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/libdbxml25d.pdb"
OptimizeReferences="1"
@@ -154,9 +154,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libdb48d.lib xqilla24d.lib xerces-c_3mgd.lib"
+ AdditionalDependencies="libdb48d.lib xqilla24d.lib xerces-c_3mgd.lib zlibd.lib"
OutputFile="$(OutDir)/libdbxml25d.dll"
- AdditionalLibraryDirectories=""$(OutDir)";"../../db-4.8.26/build_windows/$(ConfigurationName)64";"../../xqilla/build/windows/vc8/$(ConfigurationName)64";"../../xerces-c-src/Build/$(PlatformName)/VC9/$(ConfigurationName)""
+ AdditionalLibraryDirectories=""$(OutDir)";"../../db-4.8.26/build_windows/$(ConfigurationName)64";"../../xqilla/build/windows/vc8/$(ConfigurationName)64";"../../xerces-c-src/Build/$(PlatformName)/VC9/$(ConfigurationName)";../../../gd/lpng/projects/visualc8/Win64_LIB_Debug/ZLib"
IgnoreAllDefaultLibraries="false"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -383,11 +383,11 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/machine:x86"
- AdditionalDependencies="libdb48.lib xqilla24.lib xerces-c_3mg.lib"
+ AdditionalDependencies="libdb48.lib xqilla24.lib xerces-c_3mg.lib zlib.lib"
OutputFile="$(OutDir)/libdbxml25.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(OutDir)";"../../db-4.8.26/build_windows/$(ConfigurationName)32";"../../xqilla/build/windows/vc8/$(ConfigurationName)32";"../../xerces-c-src/Build/$(PlatformName)/VC9/$(ConfigurationName)""
+ AdditionalLibraryDirectories=""$(OutDir)";"../../db-4.8.26/build_windows/$(ConfigurationName)32";"../../xqilla/build/windows/vc8/$(ConfigurationName)32";"../../xerces-c-src/Build/$(PlatformName)/VC9/$(ConfigurationName)";../../../gd/lpng/projects/visualc8/Win32_LIB_Release/ZLib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/libdbxml25.pdb"
OptimizeReferences="2"
@@ -459,9 +459,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libdb48.lib xqilla24.lib xerces-c_3mg.lib"
+ AdditionalDependencies="libdb48.lib xqilla24.lib xerces-c_3mg.lib zlib.lib"
OutputFile="$(OutDir)/libdbxml25.dll"
- AdditionalLibraryDirectories=""$(OutDir)";"../../db-4.8.26/build_windows/$(ConfigurationName)64";"../../xqilla/build/windows/vc8/$(ConfigurationName)64";"../../xerces-c-src/Build/$(PlatformName)/VC9/$(ConfigurationName)""
+ AdditionalLibraryDirectories=""$(OutDir)";"../../db-4.8.26/build_windows/$(ConfigurationName)64";"../../xqilla/build/windows/vc8/$(ConfigurationName)64";"../../xerces-c-src/Build/$(PlatformName)/VC9/$(ConfigurationName)";../../../gd/lpng/projects/visualc8/Win64_LIB_Release/ZLib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/libdbxml25.pdb"
RandomizedBaseAddress="1"
More information about the mapguide-commits
mailing list