[mapguide-commits] r8679 - in sandbox/jng/diet_installer: . Support/Web/x64 Support/Web/x86

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-05-26 08:12:52 -0700 (Tue, 26 May 2015)
New Revision: 8679

Removed:
   sandbox/jng/diet_installer/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
   sandbox/jng/diet_installer/Support/Web/x64/php-5.5.17-x64-VC11.zip
   sandbox/jng/diet_installer/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
   sandbox/jng/diet_installer/Support/Web/x86/php-5.5.17-x86-VC11.zip
Modified:
   sandbox/jng/diet_installer/build.bat
Log:
The PHP and HTTPD binaries in our installer can be sourced externally.

build.bat has been updated to wget these binaries and save them in their existing file locations if they don't exist. Alternatively if faster mirrors exist, the PHP and HTTPD download URL environment variables can be set before running build.bat

The current download URLs are:
 - PHP: The official PHP windows repository (windows.php.net)
 - HTTPD: Locally hosted on OSGeo (this was originally downloaded from apachelounge, but they do not maintain an archive)

Deleted: sandbox/jng/diet_installer/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
===================================================================
(Binary files differ)

Deleted: sandbox/jng/diet_installer/Support/Web/x64/php-5.5.17-x64-VC11.zip
===================================================================
(Binary files differ)

Deleted: sandbox/jng/diet_installer/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
===================================================================
(Binary files differ)

Deleted: sandbox/jng/diet_installer/Support/Web/x86/php-5.5.17-x86-VC11.zip
===================================================================
(Binary files differ)

Modified: sandbox/jng/diet_installer/build.bat
===================================================================
--- sandbox/jng/diet_installer/build.bat	2015-05-26 14:57:56 UTC (rev 8678)
+++ sandbox/jng/diet_installer/build.bat	2015-05-26 15:12:52 UTC (rev 8679)
@@ -38,6 +38,8 @@
 rem Command Line Option Defaults
 rem ==================================================
 
+SET PLATFORM_CLR=%MG_OEM_CLR_PLATFORM%
+
 SET TYPEACTION=build
 SET CULTURE=en-US
 SET INSTALLER_VERSION_MAJOR_MINOR=3.0
@@ -80,14 +82,27 @@
 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_PACKAGE=httpd-%HTTPD_VERSION%-%PLATFORM_CLR%-VC11.zip
+SET HTTPD_VERSION=%MG_OEM_HTTPD_VER%
+SET PHP_VERSION=%MG_OEM_PHP_VER%
+SET TOMCAT_VERSION=%MG_OEM_TOMCAT_VER%
+SET HTTPD_PACKAGE=%MG_OEM_HTTPD_PACKAGE_NAME%
 SET TOMCAT_PACKAGE_NAME=%MG_OEM_TOMCAT_PACKAGE_NAME%
 SET TOMCAT_PACKAGE=%MG_OEM_TOMCAT_PACKAGE%
-SET PHP_TS_PACKAGE=php-%PHP_VERSION%-%PLATFORM_CLR%-VC11.zip
+SET PHP_TS_PACKAGE=%MG_OEM_PHP_PACKAGE_NAME%
 
+rem ===========================================================
+rem Download sources for packages should they not exist locally
+rem
+rem If you have a faster mirror than the given URLs below, you 
+rem can set PHP_DOWNLOAD_URL and HTTPD_DOWNLOAD_URL as 
+rem appropriate before running this script
+rem ===========================================================
+rem PHP will use official PHP windows download repository
+IF "%PHP_DOWNLOAD_URL%"=="" SET PHP_DOWNLOAD_URL=http://windows.php.net/downloads/releases/archives/php-%PHP_VERSION%-Win32-VC11-%MG_OEM_CLR_PLATFORM%.zip
+rem Our HTTPD windows package is hosted locally on OSGeo as apachelounge don't appear to keep archives
+IF "%HTTPD_DOWNLOAD_URL%"=="" SET HTTPD_DOWNLOAD_URL=http://download.osgeo.org/mapguide/support/packages/3.0.0/%MG_OEM_HTTPD_PACKAGE_NAME%
+
+
 :study_params
 if (%1)==() goto start_build
 
@@ -179,6 +194,10 @@
 popd
 echo [prepare] Unpack Apache httpd
 pushd "%INSTALLER_DEV_SUPPORT%\Web\%PLATFORM_CLR%"
+if not exist "%HTTPD_PACKAGE%" (
+    echo [prepare]: Downloading httpd package from designated source
+    wget -O "%HTTPD_PACKAGE%" "%HTTPD_DOWNLOAD_URL%"
+)
 7z x %HTTPD_PACKAGE% -y -o"%MG_SOURCE%\Web"
 popd
 echo [prepare] Unpack Tomcat
@@ -201,6 +220,10 @@
 popd
 echo [prepare] Unpack PHP (Thread Safe)
 pushd "%INSTALLER_DEV_SUPPORT%\Web\%PLATFORM_CLR%"
+if not exist "%PHP_TS_PACKAGE%" (
+    echo [prepare]: Downloading PHP package from designated source
+    wget -O "%PHP_TS_PACKAGE%" "%PHP_DOWNLOAD_URL%"
+)
 7z x %PHP_TS_PACKAGE% -y -o"%MG_SOURCE%\Web\Php"
 popd
 echo [prepare] Copy support dlls for PostgreSQL provider