[mapguide-commits] r9336 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-03-03 04:22:48 -0800 (Sat, 03 Mar 2018)
New Revision: 9336

Modified:
   trunk/MgDev/
   trunk/MgDev/setenvironment64.bat
Log:
Merged revision(s) 9329 from branches/3.1/MgDev:
#2774: Don't hardcode, just reference the version env vars set in setenvironment.bat/setenvironment64.bat
........


Index: trunk/MgDev
===================================================================
--- trunk/MgDev	2018-03-03 12:21:40 UTC (rev 9335)
+++ trunk/MgDev	2018-03-03 12:22:48 UTC (rev 9336)

Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
 /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
 /branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
 /branches/3.0/MgDev:8658,8705,8710
-/branches/3.1/MgDev:9026,9058-9059,9067-9068,9322-9323
+/branches/3.1/MgDev:9026,9058-9059,9067-9068,9322-9323,9329
 /sandbox/VC140:8684-8759
 /sandbox/adsk/2.6l:8727
 /sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
Modified: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat	2018-03-03 12:21:40 UTC (rev 9335)
+++ trunk/MgDev/setenvironment64.bat	2018-03-03 12:22:48 UTC (rev 9336)
@@ -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