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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-04-03 04:43:11 -0700 (Thu, 03 Apr 2014)
New Revision: 8010

Modified:
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/Libraries/MapGuide Server/FDO.wxs
   trunk/Installer/build.bat
Log:
#2406: Enable PostgreSQL provider by default. We re-use required dlls that are included with the PHP 5.5 distribution.

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs	2014-04-02 14:08:41 UTC (rev 8009)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2014-04-03 11:43:11 UTC (rev 8010)
@@ -472,11 +472,10 @@
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="FdoArcSdeProviderFeature" Order="3">1</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="FdoKingOracleProviderFeature" Order="4">1</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="FdoMySqlProviderFeature" Order="5">1</Publish>
-            <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="FdoPostgreSqlProviderFeature" Order="6">1</Publish>
             <!-- If Apache, or IIS and the .Net Framework is not installed, set feature default for the ASPX viewer to not install -->
-            <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtMapViewerASPXFeature" Order="7">(MGWEB_CONFIG="APACHE") OR (MGWEB_CONFIG="IIS" AND NOT NETFRAMEWORK40FULL)</Publish>
-            <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="ApacheConfigDlg" Order="8">MGWEB_CONFIG="APACHE"</Publish>
-            <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="FastCgiWarningDlg" Order="9">MGWEB_CONFIG="IIS"</Publish>
+            <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtMapViewerASPXFeature" Order="6">(MGWEB_CONFIG="APACHE") OR (MGWEB_CONFIG="IIS" AND NOT NETFRAMEWORK40FULL)</Publish>
+            <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="ApacheConfigDlg" Order="7">MGWEB_CONFIG="APACHE"</Publish>
+            <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="FastCgiWarningDlg" Order="8">MGWEB_CONFIG="IIS"</Publish>
             <!-- If IIS, set feature defaults for Apache, Tomcat, and JSP viewer to not install -->
             <!-- 
             Turn off:

Modified: trunk/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs	2014-04-02 14:08:41 UTC (rev 8009)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs	2014-04-03 11:43:11 UTC (rev 8010)
@@ -149,6 +149,9 @@
           <Component Id="FdoPostgreSqlProviderComponent" Win64="$(var.Win64)" Guid="550B6CA0-10F8-444B-B51B-8569FF23B8C2">
               <File Id="PostgreSqlOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostgreSQLOverrides.dll" />
               <File Id="PostgreSqlProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostgreSQLProvider.dll" />
+              <File Id="LibPq" Checksum="yes" Source="$(var.MgSource)\Server\FDO\libpq.dll" />
+              <File Id="LibEay" Checksum="yes" Source="$(var.MgSource)\Server\FDO\libeay32.dll" />
+              <File Id="SslEay" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ssleay32.dll" />
           </Component>
           <!-- SDF Provider -->
           <Component Id="FdoSdfProviderComponent" Win64="$(var.Win64)" Guid="F0976038-9F62-42E7-AA6E-B37C33744C6F">

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2014-04-02 14:08:41 UTC (rev 8009)
+++ trunk/Installer/build.bat	2014-04-03 11:43:11 UTC (rev 8010)
@@ -205,6 +205,10 @@
 pushd "%INSTALLER_DEV_SUPPORT%\Web\%PLATFORM_CLR%"
 7z x %PHP_TS_PACKAGE% -y -o"%MG_SOURCE%\Web\Php"
 popd
+echo [prepare] Copy support dlls for PostgreSQL provider
+copy /Y "%MG_SOURCE%\Web\Php\libpq.dll" "%MG_SOURCE%\Server\FDO"
+copy /Y "%MG_SOURCE%\Web\Php\libeay32.dll" "%MG_SOURCE%\Server\FDO"
+copy /Y "%MG_SOURCE%\Web\Php\ssleay32.dll" "%MG_SOURCE%\Server\FDO"
 rem copy template configs on top
 echo [prepare] Tomcat config
 %XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt