[mapguide-commits] r6705 - in trunk/Installer: Installers/MapGuide Libraries/MapGuide Server

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-05-29 04:37:40 -0700 (Tue, 29 May 2012)
New Revision: 6705

Modified:
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/Libraries/MapGuide Server/FDO.wxs
Log:
Installer fixes:
 - Hard-code the long FDO version. We can't chain from an existing property :(
 - Update the gdal file reference in FDO

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs	2012-05-29 09:44:49 UTC (rev 6704)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2012-05-29 11:37:40 UTC (rev 6705)
@@ -64,7 +64,7 @@
         <Property Id="MG_SITE_PORT" Secure="yes" Value="2812" />
         <!-- Used by FdoRegUtil.exe -->
         <Property Id="FDO_VERSION_SMALL" Secure="yes" Value="3.7" />
-        <Property Id="FDO_VERSION" Secure="yes" Value="[FDO_VERSION_SMALL].0.0" />
+        <Property Id="FDO_VERSION" Secure="yes" Value="3.7.0.0" />
         <!-- IIS vars -->
         <Property Id="ASPNETVERSION" Value="v4.0" />
         <Property Id="PHP_FCGI_HANDLER_NAME" Value="MapGuide_[MG_VERSION_MAJOR_MINOR]_PHP_via_FastCGI" />

Modified: trunk/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs	2012-05-29 09:44:49 UTC (rev 6704)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs	2012-05-29 11:37:40 UTC (rev 6705)
@@ -103,7 +103,7 @@
               <File Id="XalanLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\Xalan-C_1_11.dll" />
               <File Id="XalanMessagesLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\XalanMessages_1_11.dll" />
               <File Id="XercesLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\xerces-c_3_1.dll" />
-              <File Id="GdalLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\gdal17.dll" />
+              <File Id="GdalLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\gdal19.dll" />
               <File Id="FdoExpressionEngine" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ExpressionEngine.dll" />
               <File Id="FdoCore" Checksum="yes" Source="$(var.MgSource)\Server\FDO\FDO.dll" />
               <File Id="FdoCommon" Checksum="yes" Source="$(var.MgSource)\Server\FDO\FDOCommon.dll" />