[mapguide-commits] r8678 - sandbox/jng/diet_oem

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-05-26 07:57:56 -0700 (Tue, 26 May 2015)
New Revision: 8678

Modified:
   sandbox/jng/diet_oem/setenvironment.bat
Log:
Set PHP and HTTPD package names as environment variables

Modified: sandbox/jng/diet_oem/setenvironment.bat
===================================================================
--- sandbox/jng/diet_oem/setenvironment.bat	2015-05-26 13:07:33 UTC (rev 8677)
+++ sandbox/jng/diet_oem/setenvironment.bat	2015-05-26 14:57:56 UTC (rev 8678)
@@ -1,5 +1,6 @@
 @echo off
 SET MG_OEM_PLATFORM=x64
+SET MG_OEM_CLR_PLATFORM=x64
 SET MG_OEM_PLAT_SHORT=64
 SET MG_OEM_CONFIG=Release
 :study_params
@@ -25,6 +26,7 @@
 SET MG_OEM_PLATFORM=%2
 if "%2"=="Win32" (
     SET MG_OEM_PLAT_SHORT=
+    SET MG_OEM_CLR_PLATFORM=x86
     goto next_param
 )
 if "%2"=="x64" goto next_param
@@ -89,6 +91,7 @@
 SET MG_OEM_HTTPD_ROOT=%CD%\LinuxApt\httpd-%MG_OEM_HTTPD_VER%
 SET MG_OEM_HTTPD_LIB_DIR=%CD%\httpd\lib%MG_OEM_PLAT_SHORT%
 SET MG_OEM_HTTPD_LIBS=libhttpd.lib;libapr-1.lib;libaprutil-1.lib
+SET MG_OEM_HTTPD_PACKAGE_NAME=httpd-%MG_OEM_HTTPD_VER%-%MG_OEM_CLR_PLATFORM%-VC11.zip
 REM ==================== PHP ==========================
 SET MG_OEM_PHP_ROOT=%CD%\LinuxApt\php-%MG_OEM_PHP_VER%
 if "%MG_OEM_PLATFORM%"=="x64" (
@@ -97,6 +100,7 @@
 SET MG_OEM_PHP_LIB_DIR=%CD%\php\Release_TS
 )
 SET MG_OEM_PHP_LIBS=php5ts.lib
+SET MG_OEM_PHP_PACKAGE_NAME=php-%MG_OEM_PHP_VER%-%MG_OEM_CLR_PLATFORM%-VC11.zip
 REM ==================== Tomcat =======================
 SET MG_OEM_TOMCAT_PACKAGE_NAME=apache-tomcat-%MG_OEM_TOMCAT_VER%
 SET MG_OEM_TOMCAT_PACKAGE=%CD%\LinuxApt\%MG_OEM_TOMCAT_PACKAGE_NAME%.tar.gz
@@ -368,10 +372,12 @@
 echo MG_OEM_HTTPD_ROOT = %MG_OEM_HTTPD_ROOT%
 echo MG_OEM_HTTPD_LIB_DIR = %MG_OEM_HTTPD_LIB_DIR%
 echo MG_OEM_HTTPD_LIBS = %MG_OEM_HTTPD_LIBS%
+echo MG_OEM_HTTPD_PACKAGE_NAME = %MG_OEM_HTTPD_PACKAGE_NAME%
 echo ==================== PHP ==========================
 echo MG_OEM_PHP_INC_DIR = %MG_OEM_PHP_INC_DIR%
 echo MG_OEM_PHP_LIB_DIR = %MG_OEM_PHP_LIB_DIR%
 echo MG_OEM_PHP_LIBS = %MG_OEM_PHP_LIBS%
+echo MG_OEM_PHP_PACKAGE_NAME = %MG_OEM_PHP_PACKAGE_NAME%
 echo ==================== JSONCPP ======================
 echo MG_OEM_JSONCPP_INC_DIR = %MG_OEM_JSONCPP_INC_DIR%
 echo MG_OEM_JSONCPP_LIB_DIR = %MG_OEM_JSONCPP_LIB_DIR%