[mapguide-commits] r7827 - in sandbox/jng/webtier_upgrade_v2/Installer: . Bootstrapper Installers/MapGuide Libraries/MapGuide Web Extensions

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri Aug 30 09:56:10 PDT 2013 

Author: jng
Date: 2013-08-30 09:56:10 -0700 (Fri, 30 Aug 2013)
New Revision: 7827

Removed:
   sandbox/jng/webtier_upgrade_v2/Installer/Bootstrapper/vcredist_2008_x64.exe
   sandbox/jng/webtier_upgrade_v2/Installer/Bootstrapper/vcredist_2008_x86.exe
   sandbox/jng/webtier_upgrade_v2/Installer/Bootstrapper/vcredist_2010_x64.exe
   sandbox/jng/webtier_upgrade_v2/Installer/Bootstrapper/vcredist_2010_x86.exe
Modified:
   sandbox/jng/webtier_upgrade_v2/Installer/Bootstrapper/Setup.nsi
   sandbox/jng/webtier_upgrade_v2/Installer/Features.xml
   sandbox/jng/webtier_upgrade_v2/Installer/Installers/MapGuide/MapGuide.wxs
   sandbox/jng/webtier_upgrade_v2/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
   sandbox/jng/webtier_upgrade_v2/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
Log:
Installer updates:
 - Update Apache/PHP version numbers
 - Un-bundle and remove VC 2008 and 2010 runtime installers
 - Update Apache path from Apache2 to Apache24

Modified: sandbox/jng/webtier_upgrade_v2/Installer/Bootstrapper/Setup.nsi
===================================================================
--- sandbox/jng/webtier_upgrade_v2/Installer/Bootstrapper/Setup.nsi	2013-08-30 15:13:06 UTC (rev 7826)
+++ sandbox/jng/webtier_upgrade_v2/Installer/Bootstrapper/Setup.nsi	2013-08-30 16:56:10 UTC (rev 7827)
@@ -49,75 +49,7 @@
 	
 	Push $R0
     ClearErrors
-;
-; NOTE: We're keeping the VC2008 redist check here as some PHP extensions are built against MSVCR90
-;
-CheckVC2008Install:
-;
-; http://social.msdn.microsoft.com/Forums/en-US/vcgeneral/thread/639e2cfd-bb61-425b-a087-a2442df23402   
-;
-!if ${CPU} = "x64"
-	SetRegView 64
-    ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\DevDiv\VC\Servicing\9.0\RED\1033" "SP"
-    IfErrors InstallVC2008Redist CheckVC2010Install
-!else
-	SetRegView 32
-    ; Reg key for 32-bit OS
-    ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\DevDiv\VC\Servicing\9.0\RED\1033" "SP"
-    IfErrors CheckVS2008Wow32Registry CheckVC2010Install
-	
-CheckVS2008Wow32Registry:	
-	SetRegView 64
-    ; Reg key for 64-bit OS (WoW32)
-    ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\DevDiv\VC\Servicing\9.0\RED\1033" "SP"
-    IfErrors InstallVC2008Redist CheckVC2010Install
-!endif
 
-InstallVC2008Redist:
-	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"'
-!else
-	File /r "${INSTALLER_OUTPUT}\vcredist_2008_x86.exe"
-	ExecWait '"$OUTDIR\vcredist_2008_x86.exe" /q:a'
-!endif
-	Banner::destroy
-
-CheckVC2010Install:
-;
-; http://blogs.msdn.com/b/astebner/archive/2010/05/05/10008146.aspx
-;
-!if ${CPU} = "x64"
-	SetRegView 64
-    ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x64" "Installed"
-    IfErrors InstallVC2010Redist BeginInstall
-!else
-	SetRegView 32
-    ; Reg key for 32-bit OS
-    ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86" "Installed"
-    IfErrors CheckVS2010Wow32Registry BeginInstall
-	
-CheckVS2010Wow32Registry:	
-	SetRegView 64
-    ; Reg key for 64-bit OS (WoW32)
-    ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86" "Installed"
-    IfErrors InstallVC2010Redist BeginInstall
-!endif
-
-InstallVC2010Redist:
-	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'
-!else
-	File /r "${INSTALLER_OUTPUT}\vcredist_2010_x86.exe"
-	ExecWait '"$OUTDIR\vcredist_2010_x86.exe" /passive /norestart'
-!endif
-	Banner::destroy
-
 BeginInstall:
     ; Install VC 2012 redist. Not going to check here. I think we can trust the vcredist install to not trample over anything
     Banner::show /NOUNLOAD "Installing Visual C++ 2012 Redistributable"

Deleted: sandbox/jng/webtier_upgrade_v2/Installer/Bootstrapper/vcredist_2008_x64.exe
===================================================================
(Binary files differ)

Deleted: sandbox/jng/webtier_upgrade_v2/Installer/Bootstrapper/vcredist_2008_x86.exe
===================================================================
(Binary files differ)

Deleted: sandbox/jng/webtier_upgrade_v2/Installer/Bootstrapper/vcredist_2010_x64.exe
===================================================================
(Binary files differ)

Deleted: sandbox/jng/webtier_upgrade_v2/Installer/Bootstrapper/vcredist_2010_x86.exe
===================================================================
(Binary files differ)

Modified: sandbox/jng/webtier_upgrade_v2/Installer/Features.xml
===================================================================
--- sandbox/jng/webtier_upgrade_v2/Installer/Features.xml	2013-08-30 15:13:06 UTC (rev 7826)
+++ sandbox/jng/webtier_upgrade_v2/Installer/Features.xml	2013-08-30 16:56:10 UTC (rev 7827)
@@ -2,7 +2,7 @@
 <FeatureMap>
   <DirectorySearch Name=".svn" Suffix="_SVNMETADATA" />
   <IdentifierOverride Pattern="Server\bin\mgserver.exe" Identifier="MGSERVER_EXE" />
-  <IdentifierOverride Pattern="Apache2\bin\httpd.exe" Identifier="HTTPD_EXE" />
+  <IdentifierOverride Pattern="Apache24\bin\httpd.exe" Identifier="HTTPD_EXE" />
   <IdentifierOverride Pattern="Tomcat\bin\service.bat" Identifier="TOMCAT_SERVICE_BAT" />
   <IdentifierOverride Pattern="Tomcat\bin\tomcat7.exe" Identifier="TOMCAT_EXE" />
 </FeatureMap>
\ No newline at end of file

Modified: sandbox/jng/webtier_upgrade_v2/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- sandbox/jng/webtier_upgrade_v2/Installer/Installers/MapGuide/MapGuide.wxs	2013-08-30 15:13:06 UTC (rev 7826)
+++ sandbox/jng/webtier_upgrade_v2/Installer/Installers/MapGuide/MapGuide.wxs	2013-08-30 16:56:10 UTC (rev 7827)
@@ -46,8 +46,8 @@
         </Property>
         <Property Id="MGSERVER_IP" Secure="yes" Value="127.0.0.1" />
         <Property Id="APACHE_PORT" Secure="yes" Value="8008" />
-        <Property Id="APACHE_VERSION" Secure="yes" Value="2.2.21" />
-        <Property Id="PHP_VERSION" Secure="yes" Value="5.3.8" />
+        <Property Id="APACHE_VERSION" Secure="yes" Value="2.4.6" />
+        <Property Id="PHP_VERSION" Secure="yes" Value="5.5.3" />
         <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.6" />
         <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide26AppPool">
             <RegistrySearch
@@ -930,9 +930,11 @@
             <Custom
                 Action="RemoveApacheServiceCA"
                 Before="RemoveFiles">MGWEB_CONFIG="APACHE" AND &WebExtApacheFeature=2</Custom>
+            <!--
             <Custom
                 Action="RemoveTomcatServiceCA"
                 Before="RemoveFiles">MGWEB_CONFIG="APACHE" AND &WebExtTomcatFeature>2</Custom>
+            -->
         </InstallExecuteSequence>
     </Product>
 </Wix>

Modified: sandbox/jng/webtier_upgrade_v2/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
===================================================================
--- sandbox/jng/webtier_upgrade_v2/Installer/Libraries/MapGuide Web Extensions/Apache.wxs	2013-08-30 15:13:06 UTC (rev 7826)
+++ sandbox/jng/webtier_upgrade_v2/Installer/Libraries/MapGuide Web Extensions/Apache.wxs	2013-08-30 16:56:10 UTC (rev 7827)
@@ -20,8 +20,10 @@
         <CustomAction Id="RemoveApacheServiceCA" Execute="immediate" Return="ignore" FileKey="HTTPD_EXE" ExeCommand="-k uninstall -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
         <CustomAction Id="InstallApacheServiceCA" Execute="deferred" Return="ignore" FileKey="HTTPD_EXE" ExeCommand="-k install -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
         <CustomAction Id="StartApacheServiceCA" Execute="deferred" Return="ignore" FileKey="HTTPD_EXE" ExeCommand="-k start -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
+        <!--
         <CustomAction Id="RemoveTomcatServiceCA" Execute="immediate" Return="ignore" FileKey="TOMCAT_EXE" ExeCommand="//DS//TomcatMapGuide[MG_VERSION_MAJOR_MINOR]" />
         <CustomAction Id="InstallTomcatServiceCA" Execute="deferred" Return="ignore" FileKey="TOMCAT_SERVICE_BAT" ExeCommand="install TomcatMapGuide[MG_VERSION_MAJOR_MINOR]" />
         <CustomAction Id="StartTomcatServiceCA" Execute="deferred" Return="ignore" FileKey="TOMCAT_EXE" ExeCommand="//RS//TomcatMapGuide[MG_VERSION_MAJOR_MINOR]" />
-	</Fragment>
+        -->
+    </Fragment>
 </Wix>
\ No newline at end of file

Modified: sandbox/jng/webtier_upgrade_v2/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- sandbox/jng/webtier_upgrade_v2/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs	2013-08-30 15:13:06 UTC (rev 7826)
+++ sandbox/jng/webtier_upgrade_v2/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs	2013-08-30 16:56:10 UTC (rev 7827)
@@ -56,7 +56,7 @@
                         </CreateFolder>
                     </Component>
                 </Directory>
-                <Directory Id="APACHELOCATION" Name="Apache2" />
+                <Directory Id="APACHELOCATION" Name="Apache24" />
                 <Directory Id="PHPLOCATION" Name="Php">
                     <Component Id="WebExtPhpComponent" Win64="$(var.Win64)" Guid="88814E96-07DC-4fb7-A993-F31FC1E000CB" Feature="WebExtPhpFeature">
                         <CreateFolder />

More information about the mapguide-commits mailing list