[mapguide-commits] r8877 - in sandbox/jng/rfc155_installer: . Bootstrapper Installers/MapGuide Support/Web/x64 Support/Web/x86
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Mar 14 03:59:58 PDT 2016
Author: jng
Date: 2016-03-14 03:59:58 -0700 (Mon, 14 Mar 2016)
New Revision: 8877
Added:
sandbox/jng/rfc155_installer/Bootstrapper/vc_redist.x64.exe
sandbox/jng/rfc155_installer/Bootstrapper/vc_redist.x86.exe
sandbox/jng/rfc155_installer/Support/Web/x64/httpd-2.4.18-x64-VC11.zip
sandbox/jng/rfc155_installer/Support/Web/x64/php-5.5.33-x64-VC11.zip
sandbox/jng/rfc155_installer/Support/Web/x86/httpd-2.4.18-x86-VC11.zip
sandbox/jng/rfc155_installer/Support/Web/x86/php-5.5.33-x86-VC11.zip
Removed:
sandbox/jng/rfc155_installer/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
sandbox/jng/rfc155_installer/Support/Web/x64/php-5.5.17-x64-VC11.zip
sandbox/jng/rfc155_installer/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
sandbox/jng/rfc155_installer/Support/Web/x86/php-5.5.17-x86-VC11.zip
Modified:
sandbox/jng/rfc155_installer/Bootstrapper/Setup.nsi
sandbox/jng/rfc155_installer/Installers/MapGuide/MapGuide.wxs
sandbox/jng/rfc155_installer/Support/Web/x64/mod_jk.so
sandbox/jng/rfc155_installer/Support/Web/x86/mod_jk.so
sandbox/jng/rfc155_installer/build.bat
Log:
Update windows installer binaries
- PHP 5.5.17 -> 5.5.33
- httpd 2.4.10 -> 2.4.18
- mod_jk.so 1.2.40 -> 1.2.41
- Include MSVC 2015 redist packages
Modified: sandbox/jng/rfc155_installer/Bootstrapper/Setup.nsi
===================================================================
--- sandbox/jng/rfc155_installer/Bootstrapper/Setup.nsi 2016-03-14 10:28:54 UTC (rev 8876)
+++ sandbox/jng/rfc155_installer/Bootstrapper/Setup.nsi 2016-03-14 10:59:58 UTC (rev 8877)
@@ -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
Added: sandbox/jng/rfc155_installer/Bootstrapper/vc_redist.x64.exe
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/rfc155_installer/Bootstrapper/vc_redist.x64.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: sandbox/jng/rfc155_installer/Bootstrapper/vc_redist.x86.exe
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/rfc155_installer/Bootstrapper/vc_redist.x86.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: sandbox/jng/rfc155_installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- sandbox/jng/rfc155_installer/Installers/MapGuide/MapGuide.wxs 2016-03-14 10:28:54 UTC (rev 8876)
+++ sandbox/jng/rfc155_installer/Installers/MapGuide/MapGuide.wxs 2016-03-14 10:59:58 UTC (rev 8877)
@@ -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
Deleted: sandbox/jng/rfc155_installer/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
===================================================================
(Binary files differ)
Added: sandbox/jng/rfc155_installer/Support/Web/x64/httpd-2.4.18-x64-VC11.zip
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/rfc155_installer/Support/Web/x64/httpd-2.4.18-x64-VC11.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: sandbox/jng/rfc155_installer/Support/Web/x64/mod_jk.so
===================================================================
(Binary files differ)
Deleted: sandbox/jng/rfc155_installer/Support/Web/x64/php-5.5.17-x64-VC11.zip
===================================================================
(Binary files differ)
Added: sandbox/jng/rfc155_installer/Support/Web/x64/php-5.5.33-x64-VC11.zip
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/rfc155_installer/Support/Web/x64/php-5.5.33-x64-VC11.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: sandbox/jng/rfc155_installer/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
===================================================================
(Binary files differ)
Added: sandbox/jng/rfc155_installer/Support/Web/x86/httpd-2.4.18-x86-VC11.zip
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/rfc155_installer/Support/Web/x86/httpd-2.4.18-x86-VC11.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: sandbox/jng/rfc155_installer/Support/Web/x86/mod_jk.so
===================================================================
(Binary files differ)
Deleted: sandbox/jng/rfc155_installer/Support/Web/x86/php-5.5.17-x86-VC11.zip
===================================================================
(Binary files differ)
Added: sandbox/jng/rfc155_installer/Support/Web/x86/php-5.5.33-x86-VC11.zip
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/rfc155_installer/Support/Web/x86/php-5.5.33-x86-VC11.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: sandbox/jng/rfc155_installer/build.bat
===================================================================
--- sandbox/jng/rfc155_installer/build.bat 2016-03-14 10:28:54 UTC (rev 8876)
+++ sandbox/jng/rfc155_installer/build.bat 2016-03-14 10:59:58 UTC (rev 8877)
@@ -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
More information about the mapguide-commits
mailing list