[mapguide-commits] r8858 - in sandbox/jng/installer-vs2015: . Bootstrapper Custom/apache_actions Support/Web/x64 Support/Web/x86
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Dec 8 03:25:13 PST 2015
Author: jng
Date: 2015-12-08 03:25:13 -0800 (Tue, 08 Dec 2015)
New Revision: 8858
Added:
sandbox/jng/installer-vs2015/Bootstrapper/VC_redist.x64.exe
sandbox/jng/installer-vs2015/Bootstrapper/VC_redist.x86.exe
sandbox/jng/installer-vs2015/Support/Web/x64/httpd-2.4.17-x64-VC14.zip
sandbox/jng/installer-vs2015/Support/Web/x64/php-7.0.0-x64-VC14.zip
sandbox/jng/installer-vs2015/Support/Web/x86/httpd-2.4.17-x86-VC14.zip
sandbox/jng/installer-vs2015/Support/Web/x86/php-7.0.0-x86-VC14.zip
Removed:
sandbox/jng/installer-vs2015/Bootstrapper/vcredist_2012_x64.exe
sandbox/jng/installer-vs2015/Bootstrapper/vcredist_2012_x86.exe
sandbox/jng/installer-vs2015/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
sandbox/jng/installer-vs2015/Support/Web/x64/php-5.5.17-x64-VC11.zip
sandbox/jng/installer-vs2015/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
sandbox/jng/installer-vs2015/Support/Web/x86/php-5.5.17-x86-VC11.zip
Modified:
sandbox/jng/installer-vs2015/
sandbox/jng/installer-vs2015/Bootstrapper/Setup.nsi
sandbox/jng/installer-vs2015/Custom/apache_actions/
sandbox/jng/installer-vs2015/Support/Web/x64/mod_jk.so
sandbox/jng/installer-vs2015/Support/Web/x86/mod_jk.so
sandbox/jng/installer-vs2015/build.bat
Log:
Install package updates:
- Visual C++ 2015 redistributable
- httpd 2.4.10 -> 2.4.17 (from apachelounge)
- php 5.5.17 -> 7.0.0 (from windows.php.net)
- mod_jk.so (1.2.40 -> 1.2.41)
Property changes on: sandbox/jng/installer-vs2015
___________________________________________________________________
Modified: svn:ignore
- *.suo
Output
*.ncb
*.cache
ipch
+ *.suo
Output
*.ncb
*.cache
ipch
.vs
InstallerPreReq.sdf
Modified: sandbox/jng/installer-vs2015/Bootstrapper/Setup.nsi
===================================================================
--- sandbox/jng/installer-vs2015/Bootstrapper/Setup.nsi 2015-12-08 10:37:29 UTC (rev 8857)
+++ sandbox/jng/installer-vs2015/Bootstrapper/Setup.nsi 2015-12-08 11:25:13 UTC (rev 8858)
@@ -12,7 +12,7 @@
VIAddVersionKey "FileVersion" "1.0.0.0"
VIAddVersionKey "CompanyName" "Open Source Geospatial Foundation"
VIAddVersionKey "FileDescription" "Installer Bootstrapper package for MapGuide Open Source"
-VIAddVersionKey "LegalCopyright" "2013 Open Source Geospatial Foundation"
+VIAddVersionKey "LegalCopyright" "2015 Open Source Geospatial Foundation"
!ifndef CULTURE
!define CULTURE "en-us"
@@ -51,15 +51,15 @@
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"
+ ; 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}\vcredist_2012_x64.exe"
- ExecWait '"$OUTDIR\vcredist_2012_x64.exe" /install /quiet /norestart'
+ File /r "${INSTALLER_OUTPUT}\VC_redist.x64.exe"
+ ExecWait '"$OUTDIR\VC_redist.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}\VC_redist.x86.exe"
+ ExecWait '"$OUTDIR\VC_redist.x86.exe" /install /quiet /norestart'
!endif
Banner::destroy
@@ -72,9 +72,9 @@
; 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/installer-vs2015/Bootstrapper/VC_redist.x64.exe
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/installer-vs2015/Bootstrapper/VC_redist.x64.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: sandbox/jng/installer-vs2015/Bootstrapper/VC_redist.x86.exe
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/installer-vs2015/Bootstrapper/VC_redist.x86.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: sandbox/jng/installer-vs2015/Bootstrapper/vcredist_2012_x64.exe
===================================================================
(Binary files differ)
Deleted: sandbox/jng/installer-vs2015/Bootstrapper/vcredist_2012_x86.exe
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/installer-vs2015/Custom/apache_actions
___________________________________________________________________
Modified: svn:ignore
- *.user
Debug
Release
bin110_Win32
bin110_x64
Release110_Win32
Release110_x64
+ *.user
Debug
Release
bin110_Win32
bin110_x64
Release110_Win32
Release110_x64
bin140_Win32
bin140_x64
Release140_Win32
Release140_x64
Deleted: sandbox/jng/installer-vs2015/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
===================================================================
(Binary files differ)
Added: sandbox/jng/installer-vs2015/Support/Web/x64/httpd-2.4.17-x64-VC14.zip
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/installer-vs2015/Support/Web/x64/httpd-2.4.17-x64-VC14.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: sandbox/jng/installer-vs2015/Support/Web/x64/mod_jk.so
===================================================================
(Binary files differ)
Deleted: sandbox/jng/installer-vs2015/Support/Web/x64/php-5.5.17-x64-VC11.zip
===================================================================
(Binary files differ)
Added: sandbox/jng/installer-vs2015/Support/Web/x64/php-7.0.0-x64-VC14.zip
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/installer-vs2015/Support/Web/x64/php-7.0.0-x64-VC14.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: sandbox/jng/installer-vs2015/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
===================================================================
(Binary files differ)
Added: sandbox/jng/installer-vs2015/Support/Web/x86/httpd-2.4.17-x86-VC14.zip
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/installer-vs2015/Support/Web/x86/httpd-2.4.17-x86-VC14.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: sandbox/jng/installer-vs2015/Support/Web/x86/mod_jk.so
===================================================================
(Binary files differ)
Deleted: sandbox/jng/installer-vs2015/Support/Web/x86/php-5.5.17-x86-VC11.zip
===================================================================
(Binary files differ)
Added: sandbox/jng/installer-vs2015/Support/Web/x86/php-7.0.0-x86-VC14.zip
===================================================================
(Binary files differ)
Property changes on: sandbox/jng/installer-vs2015/Support/Web/x86/php-7.0.0-x86-VC14.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: sandbox/jng/installer-vs2015/build.bat
===================================================================
--- sandbox/jng/installer-vs2015/build.bat 2015-12-08 10:37:29 UTC (rev 8857)
+++ sandbox/jng/installer-vs2015/build.bat 2015-12-08 11:25:13 UTC (rev 8858)
@@ -40,7 +40,7 @@
SET TYPEACTION=build
SET CULTURE=en-US
-SET INSTALLER_VERSION_MAJOR_MINOR=3.0
+SET INSTALLER_VERSION_MAJOR_MINOR=3.1
SET INSTALLER_VERSION_MAJOR_MINOR_REV=%INSTALLER_VERSION_MAJOR_MINOR%.0
SET INSTALLER_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%-%PLATFORM_CLR%
SET INSTALLER_VERSION=%INSTALLER_VERSION_MAJOR_MINOR_REV%.0
@@ -80,13 +80,13 @@
rem ==================================================
rem Web dependencies
rem ==================================================
-SET HTTPD_VERSION=2.4.10
-SET PHP_VERSION=5.5.17
+SET HTTPD_VERSION=2.4.17
+SET PHP_VERSION=7.0.0
SET TOMCAT_VERSION=7.0.56
-SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-%PLATFORM_CLR%-VC11.zip
+SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-%PLATFORM_CLR%-VC14.zip
SET TOMCAT_PACKAGE_NAME=apache-tomcat-%TOMCAT_VERSION%
SET TOMCAT_PACKAGE=%MG_OEM%\LinuxApt\%TOMCAT_PACKAGE_NAME%.tar.gz
-SET PHP_TS_PACKAGE=php-%PHP_VERSION%-%PLATFORM_CLR%-VC11.zip
+SET PHP_TS_PACKAGE=php-%PHP_VERSION%-%PLATFORM_CLR%-VC14.zip
:study_params
if (%1)==() goto start_build
More information about the mapguide-commits
mailing list