[mapguide-commits] r9329 - branches/3.1/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-02-28 14:37:17 -0800 (Wed, 28 Feb 2018)
New Revision: 9329

Modified:
   branches/3.1/MgDev/setenvironment.bat
   branches/3.1/MgDev/setenvironment64.bat
Log:
#2774: Don't hardcode, just reference the version env vars set in setenvironment.bat/setenvironment64.bat

Modified: branches/3.1/MgDev/setenvironment.bat
===================================================================
--- branches/3.1/MgDev/setenvironment.bat	2018-02-28 15:26:03 UTC (rev 9328)
+++ branches/3.1/MgDev/setenvironment.bat	2018-02-28 22:37:17 UTC (rev 9329)
@@ -101,9 +101,9 @@
 call prepare_webtier_components.bat
 
 rem Set the env vars that VS will reference
-SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.6.23
+SET PHP_SRC=%MG_OEM%\LinuxApt\php-%PHP_VER%
 SET PHP_LIB=%MG_OEM%\php\Release_TS
-SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.18
+SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-%HTTPD_VER%
 SET HTTPD_LIB=%MG_OEM%\httpd\lib
 rem Sanity checks
 if not exist "%PHP_SRC%" echo Environment variable PHP_SRC does not point to a valid directory (%PHP_SRC%). Please edit setenvironment64.bat to ensure PHP_SRC points to a valid directory

Modified: branches/3.1/MgDev/setenvironment64.bat
===================================================================
--- branches/3.1/MgDev/setenvironment64.bat	2018-02-28 15:26:03 UTC (rev 9328)
+++ branches/3.1/MgDev/setenvironment64.bat	2018-02-28 22:37:17 UTC (rev 9329)
@@ -106,9 +106,9 @@
 call prepare_webtier_components.bat
 
 rem Set the env vars that VS will reference
-SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.6.23
+SET PHP_SRC=%MG_OEM%\LinuxApt\php-%PHP_VER%
 SET PHP_LIB=%MG_OEM%\php\x64\Release_TS
-SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.18
+SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-%HTTPD_VER%
 SET HTTPD_LIB=%MG_OEM%\httpd\lib64
 rem Sanity checks
 if not exist "%PHP_SRC%" echo Environment variable PHP_SRC does not point to a valid directory (%PHP_SRC%). Please edit setenvironment64.bat to ensure PHP_SRC points to a valid directory