[mapguide-commits] r8886 - in trunk/Installer: . Bootstrapper Installers/MapGuide Libraries/MapGuide Web Extensions Support/Web/x64 Support/Web/x86

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Mon Mar 14 09:56:59 PDT 2016 

Author: jng
Date: 2016-03-14 09:56:59 -0700 (Mon, 14 Mar 2016)
New Revision: 8886

Added:
   trunk/Installer/Bootstrapper/vc_redist.x64.exe
   trunk/Installer/Bootstrapper/vc_redist.x86.exe
   trunk/Installer/Support/Web/x64/httpd-2.4.18-x64-VC11.zip
   trunk/Installer/Support/Web/x64/php-5.5.33-x64-VC11.zip
   trunk/Installer/Support/Web/x86/httpd-2.4.18-x86-VC11.zip
   trunk/Installer/Support/Web/x86/php-5.5.33-x86-VC11.zip
Removed:
   trunk/Installer/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
   trunk/Installer/Support/Web/x64/php-5.5.17-x64-VC11.zip
   trunk/Installer/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
   trunk/Installer/Support/Web/x86/php-5.5.17-x86-VC11.zip
Modified:
   trunk/Installer/
   trunk/Installer/Bootstrapper/Setup.nsi
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
   trunk/Installer/Support/Web/x64/mod_jk.so
   trunk/Installer/Support/Web/x86/mod_jk.so
   trunk/Installer/build.bat
Log:
Merge rfc155_installer sandbox changes


Property changes on: trunk/Installer
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/Installer:6987-6988
/branches/3.0/Installer:8611,8688
   + /branches/2.4/Installer:6987-6988
/branches/3.0/Installer:8611,8688
/sandbox/jng/rfc155_installer:8873-8885
/trunk/Installer:8690-8872

Modified: trunk/Installer/Bootstrapper/Setup.nsi
===================================================================
--- trunk/Installer/Bootstrapper/Setup.nsi	2016-03-14 16:48:17 UTC (rev 8885)
+++ trunk/Installer/Bootstrapper/Setup.nsi	2016-03-14 16:56:59 UTC (rev 8886)
@@ -27,12 +27,12 @@
 Icon "${INSTALLER_ROOT}\Support\Graphics\OSGeo.ico"
 
 Function .onInit
-	System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
-	Pop $R0
-	
-	StrCmp $R0 0 +3
-		MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
-		Abort
+    System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
+    Pop $R0
+    
+    StrCmp $R0 0 +3
+        MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
+        Abort
 
 ; Only for 64-bit installers. Prevent installation on 32-bit windows for obvious reasons
 !if ${CPU} = "x64"
@@ -44,37 +44,51 @@
 FunctionEnd
 
 Section Main
-	SetOutPath $TEMP
-	SetOverwrite On
-	
-	Push $R0
+    SetOutPath $TEMP
+    SetOverwrite On
+    
+    Push $R0
     ClearErrors
 
 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"
-	Banner::getWindow /NOUNLOAD
+    Banner::getWindow /NOUNLOAD
 !if ${CPU} = "x64"
-	File /r "${INSTALLER_OUTPUT}\vcredist_2012_x64.exe"
-	ExecWait '"$OUTDIR\vcredist_2012_x64.exe" /install /quiet /norestart'
+    File /r "${INSTALLER_OUTPUT}\vcredist_2012_x64.exe"
+    ExecWait '"$OUTDIR\vcredist_2012_x64.exe" /install /quiet /norestart'
 !else
-	File /r "${INSTALLER_OUTPUT}\vcredist_2012_x86.exe"
-	ExecWait '"$OUTDIR\vcredist_2012_x86.exe" /install /quiet /norestart'
+    File /r "${INSTALLER_OUTPUT}\vcredist_2012_x86.exe"
+    ExecWait '"$OUTDIR\vcredist_2012_x86.exe" /install /quiet /norestart'
 !endif
-	Banner::destroy
+    Banner::destroy
+    
+    ; Install VC 2015 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++ 2015 Redistributable"
+    Banner::getWindow /NOUNLOAD
+!if ${CPU} = "x64"
+    File /r "${INSTALLER_OUTPUT}\vc_redist.x64.exe"
+    ExecWait '"$OUTDIR\vc_redist.x64.exe" /install /quiet /norestart'
+!else
+    File /r "${INSTALLER_OUTPUT}\vc_redist.x86.exe"
+    ExecWait '"$OUTDIR\vc_redist.x86.exe" /install /quiet /norestart'
+!endif
+    Banner::destroy
 
-	Banner::show /NOUNLOAD "Extracting files. Please Wait"
-	Banner::getWindow /NOUNLOAD
-	File "${INSTALLER_OUTPUT}\${OUTNAME}.msi"
-	Banner::destroy
-	; Run the MGOS installer
-	ExecWait '"msiexec" /i "$OUTDIR\${OUTNAME}.msi"'
-	; Delete the MGOS installer and any other extracted after completion
-	Delete "$OUTDIR\${OUTNAME}.msi"
+    Banner::show /NOUNLOAD "Extracting files. Please Wait"
+    Banner::getWindow /NOUNLOAD
+    File "${INSTALLER_OUTPUT}\${OUTNAME}.msi"
+    Banner::destroy
+    ; Run the MGOS installer
+    ExecWait '"msiexec" /i "$OUTDIR\${OUTNAME}.msi"'
+    ; Delete the MGOS installer and any other extracted after completion
+    Delete "$OUTDIR\${OUTNAME}.msi"
 !if ${CPU} = "x64"
     Delete "$OUTDIR\vcredist_2012_x64.exe"
+    Delete "$OUTDIR\vc_redist.x64.exe"
 !else
     Delete "$OUTDIR\vcredist_2012_x86.exe"
+    Delete "$OUTDIR\vc_redist.x86.exe"
 !endif
-	
+    
 SectionEnd
\ No newline at end of file

Copied: trunk/Installer/Bootstrapper/vc_redist.x64.exe (from rev 8885, sandbox/jng/rfc155_installer/Bootstrapper/vc_redist.x64.exe)
===================================================================
(Binary files differ)

Copied: trunk/Installer/Bootstrapper/vc_redist.x86.exe (from rev 8885, sandbox/jng/rfc155_installer/Bootstrapper/vc_redist.x86.exe)
===================================================================
(Binary files differ)

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs	2016-03-14 16:48:17 UTC (rev 8885)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2016-03-14 16:56:59 UTC (rev 8886)
@@ -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.4.10" />
-        <Property Id="PHP_VERSION" Secure="yes" Value="5.5.17" />
+        <Property Id="APACHE_VERSION" Secure="yes" Value="2.4.18" />
+        <Property Id="PHP_VERSION" Secure="yes" Value="5.5.33" />
         <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="3.0" />
         <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide30AppPool">
             <RegistrySearch

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs	2016-03-14 16:48:17 UTC (rev 8885)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs	2016-03-14 16:56:59 UTC (rev 8886)
@@ -6,10 +6,10 @@
     -->
     <?if "$(var.MgPlatform)" = "x64" ?>
         <!-- apache_actions.dll path -->
-        <?define ACTION_DLL_PATH = "..\..\Custom\apache_actions\bin110_x64\apache_actions.dll" ?>
+        <?define ACTION_DLL_PATH = "..\..\Custom\apache_actions\bin140_x64\apache_actions.dll" ?>
     <?else ?>
         <!-- apache_actions.dll path -->
-        <?define ACTION_DLL_PATH = "..\..\Custom\apache_actions\bin110_Win32\apache_actions.dll" ?>
+        <?define ACTION_DLL_PATH = "..\..\Custom\apache_actions\bin140_Win32\apache_actions.dll" ?>
     <?endif ?>
     <Fragment>
         <Binary Id="ApacheActions" SourceFile="$(var.ACTION_DLL_PATH)" />

Deleted: trunk/Installer/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
===================================================================
(Binary files differ)

Copied: trunk/Installer/Support/Web/x64/httpd-2.4.18-x64-VC11.zip (from rev 8885, sandbox/jng/rfc155_installer/Support/Web/x64/httpd-2.4.18-x64-VC11.zip)
===================================================================
(Binary files differ)

Modified: trunk/Installer/Support/Web/x64/mod_jk.so
===================================================================
(Binary files differ)

Deleted: trunk/Installer/Support/Web/x64/php-5.5.17-x64-VC11.zip
===================================================================
(Binary files differ)

Copied: trunk/Installer/Support/Web/x64/php-5.5.33-x64-VC11.zip (from rev 8885, sandbox/jng/rfc155_installer/Support/Web/x64/php-5.5.33-x64-VC11.zip)
===================================================================
(Binary files differ)

Deleted: trunk/Installer/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
===================================================================
(Binary files differ)

Copied: trunk/Installer/Support/Web/x86/httpd-2.4.18-x86-VC11.zip (from rev 8885, sandbox/jng/rfc155_installer/Support/Web/x86/httpd-2.4.18-x86-VC11.zip)
===================================================================
(Binary files differ)

Modified: trunk/Installer/Support/Web/x86/mod_jk.so
===================================================================
(Binary files differ)

Deleted: trunk/Installer/Support/Web/x86/php-5.5.17-x86-VC11.zip
===================================================================
(Binary files differ)

Copied: trunk/Installer/Support/Web/x86/php-5.5.33-x86-VC11.zip (from rev 8885, sandbox/jng/rfc155_installer/Support/Web/x86/php-5.5.33-x86-VC11.zip)
===================================================================
(Binary files differ)

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2016-03-14 16:48:17 UTC (rev 8885)
+++ trunk/Installer/build.bat	2016-03-14 16:56:59 UTC (rev 8886)
@@ -80,9 +80,9 @@
 rem ==================================================
 rem Web dependencies
 rem ==================================================
-SET HTTPD_VERSION=2.4.10
-SET PHP_VERSION=5.5.17
-SET TOMCAT_VERSION=7.0.56
+SET HTTPD_VERSION=2.4.18
+SET PHP_VERSION=5.5.33
+SET TOMCAT_VERSION=7.0.68
 SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-%PLATFORM_CLR%-VC11.zip
 SET TOMCAT_PACKAGE_NAME=apache-tomcat-%TOMCAT_VERSION%
 SET TOMCAT_PACKAGE=%MG_OEM%\LinuxApt\%TOMCAT_PACKAGE_NAME%.tar.gz
@@ -321,6 +321,7 @@
 pushd "%INSTALLER_DEV_BOOTSTRAP%"
 echo [bootstrap]: Copying vcredist
 copy /Y vcredist_2012_%PLATFORM_CLR%.exe "%INSTALLER_OUTPUT%\vcredist_2012_%PLATFORM_CLR%.exe"
+copy /Y vc_redist.%PLATFORM_CLR%.exe "%INSTALLER_OUTPUT%\vc_redist.%PLATFORM_CLR%.exe"
 popd
 if "%errorlevel%"=="1" goto error
 if "%MAX_COMPRESSION%"=="YES" goto build_max_compress

More information about the mapguide-commits mailing list