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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-04-11 09:45:51 -0700 (Wed, 11 Apr 2012)
New Revision: 6570

Modified:
   trunk/Installer/Bootstrapper/Setup.nsi
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/Libraries/MapGuide Server/InstallService.wxs
Log:
#1805: 
 - Fix broken bundled configuration in the absence of IIS. This was due to a dangling feature reference to the old PostGIS FDO provider which has been removed a long time ago.
 - Fix file offsets for 64-bit installer
 - Use banner instead of msgbox for the VC redist automatic install

Modified: trunk/Installer/Bootstrapper/Setup.nsi
===================================================================
--- trunk/Installer/Bootstrapper/Setup.nsi	2012-04-11 15:07:57 UTC (rev 6569)
+++ trunk/Installer/Bootstrapper/Setup.nsi	2012-04-11 16:45:51 UTC (rev 6570)
@@ -65,7 +65,8 @@
 !endif
 
 InstallVC2008Redist:
-	MessageBox MB_OK "Installing Visual C++ 2008 redist"
+	Banner::show /NOUNLOAD "Installing Visual C++ 2008 Redistributable"
+	Banner::getWindow /NOUNLOAD
 !if ${CPU} = "x64"
 	File /r "${INSTALLER_OUTPUT}\vcredist_2008_x64.exe"
 	ExecWait '"$OUTDIR\vcredist_2008_x64.exe" /q:a"'
@@ -73,6 +74,7 @@
 	File /r "${INSTALLER_OUTPUT}\vcredist_2008_x86.exe"
 	ExecWait '"$OUTDIR\vcredist_2008_x86.exe" /q:a'
 !endif
+	Banner::destroy
 
 CheckVC2010Install:
 ;
@@ -96,7 +98,8 @@
 !endif
 
 InstallVC2010Redist:
-	MessageBox MB_OK "Installing Visual C++ 2010 redist"
+	Banner::show /NOUNLOAD "Installing Visual C++ 2010 Redistributable"
+	Banner::getWindow /NOUNLOAD
 !if ${CPU} = "x64"
 	File /r "${INSTALLER_OUTPUT}\vcredist_2010_x64.exe"
 	ExecWait '"$OUTDIR\vcredist_2010_x64.exe" /passive /norestart'
@@ -104,6 +107,7 @@
 	File /r "${INSTALLER_OUTPUT}\vcredist_2010_x86.exe"
 	ExecWait '"$OUTDIR\vcredist_2010_x86.exe" /passive /norestart'
 !endif
+	Banner::destroy
 
 BeginInstall:
 	Banner::show /NOUNLOAD "Extracting files. Please Wait"

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs	2012-04-11 15:07:57 UTC (rev 6569)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2012-04-11 16:45:51 UTC (rev 6570)
@@ -497,6 +497,8 @@
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtMapViewerJSPFeature" Order="12">MGWEB_CONFIG=&quot;IIS&quot;</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtJavaDevGuideSamplesFeature" Order="13">MGWEB_CONFIG=&quot;IIS&quot;</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtJavaViewerSampleFeature" Order="14">MGWEB_CONFIG=&quot;IIS&quot;</Publish>
+			<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtPhpDevGuideSamplesFeature">MGWEB_CONFIG=&quot;IIS&quot;</Publish>
+			<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtPhpViewerSampleFeature">MGWEB_CONFIG=&quot;IIS&quot;</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="13">MGWEB_CONFIG=&quot;MANUAL&quot;</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
@@ -516,7 +518,7 @@
             <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="Remove" Value="FdoArcSdeProviderFeature" Order="3">1</Publish>
             <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="Remove" Value="FdoKingOracleProviderFeature" Order="4">1</Publish>
             <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="Remove" Value="FdoMySqlProviderFeature" Order="5">1</Publish>
-            <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="Remove" Value="FdoPostGisProviderFeature" Order="6">1</Publish>
+            <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="Remove" Value="FdoPostgreSqlProviderFeature" Order="6">1</Publish>
             <!-- If Apache, set feature default for the ASPX viewer to not install -->
             <!-- 
             Turn off:
@@ -842,12 +844,15 @@
             <Custom
                 Action="StartApacheServiceCA"
                 After="InstallApacheServiceCA">MGWEB_CONFIG=&quot;APACHE&quot; AND &amp;WebExtApacheFeature&gt;2</Custom>
+			<!-- Something's wrong with the Tomcat actions. So disable them for now -->
+			<!--
             <Custom
                 Action="InstallTomcatServiceCA"
                 Before="InstallFinalize">MGWEB_CONFIG=&quot;APACHE&quot; AND &amp;WebExtTomcatFeature&gt;2</Custom>
             <Custom
                 Action="StartTomcatServiceCA"
                 Before="InstallTomcatServiceCA">MGWEB_CONFIG=&quot;APACHE&quot; AND &amp;WebExtTomcatFeature&gt;2</Custom>
+			-->
             <Custom
                 Action="MgServerInstallCA"
                 Before="InstallFinalize">&amp;ServerFeature&gt;2</Custom>

Modified: trunk/Installer/Libraries/MapGuide Server/InstallService.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/InstallService.wxs	2012-04-11 15:07:57 UTC (rev 6569)
+++ trunk/Installer/Libraries/MapGuide Server/InstallService.wxs	2012-04-11 16:45:51 UTC (rev 6570)
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix   xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <!-- mgserver.exe -->
+  <?if "$(var.MgPlatform)" = "x64" ?>
+  <?define MGSERVER_MAP = "file_SRVBINFILES_23" ?>
+  <?else ?>
   <?define MGSERVER_MAP = "file_SRVBINFILES_26" ?>
+  <?endif ?>
   <Fragment>
   
     <CustomAction