[mapguide-commits] r8817 - sandbox/jng/simplify

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-11-07 07:49:46 -0800 (Sat, 07 Nov 2015)
New Revision: 8817

Modified:
   sandbox/jng/simplify/
   sandbox/jng/simplify/build.bat
   sandbox/jng/simplify/setenvironment.bat
   sandbox/jng/simplify/setenvironment64.bat
Log:
Merged revision(s) 8816 from trunk/MgDev:
Update build.bat and setenvironment[64].bat to match current build environment
........



Property changes on: sandbox/jng/simplify
___________________________________________________________________
Modified: svn:mergeinfo
   - /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:8705,8710
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
   + /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:8705,8710
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:8816

Modified: sandbox/jng/simplify/build.bat
===================================================================
--- sandbox/jng/simplify/build.bat	2015-11-07 15:39:46 UTC (rev 8816)
+++ sandbox/jng/simplify/build.bat	2015-11-07 15:49:46 UTC (rev 8817)
@@ -188,7 +188,7 @@
 if "%errorlevel%"=="1" goto error
 rem CsMap is not in Oem.sln, so we need to build that separately
 echo [build]: Building Oem - CSMap
-%MSBUILD% %MG_OEM%\CsMap\VC110\OpenSource.sln
+%MSBUILD% %MG_OEM%\CsMap\VC140\OpenSource.sln
 if "%errorlevel%"=="1" goto error
 if "%TYPECOMPONENT%"=="oem" 	goto quit
 if "%TYPECOMPONENT%"=="server" 	goto quit

Modified: sandbox/jng/simplify/setenvironment.bat
===================================================================
--- sandbox/jng/simplify/setenvironment.bat	2015-11-07 15:39:46 UTC (rev 8816)
+++ sandbox/jng/simplify/setenvironment.bat	2015-11-07 15:49:46 UTC (rev 8817)
@@ -85,7 +85,7 @@
 rem running
 rem ==================================================
 
-IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files (x86)\Java\jdk1.7.0_71
+IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files (x86)\Java\jdk1.7.0_80
 IF "%DOXYGEN%" == "" SET DOXYGEN=%MG_DEV%\BuildTools\doxygen
 IF "%GNUWIN32%" == "" SET GNUWIN32=C:\Program Files (x86)\GnuWin32\bin
 IF "%SEVENZ%" == "" SET SEVENZ=%MG_DEV%\BuildTools\WebTools\7-Zip

Modified: sandbox/jng/simplify/setenvironment64.bat
===================================================================
--- sandbox/jng/simplify/setenvironment64.bat	2015-11-07 15:39:46 UTC (rev 8816)
+++ sandbox/jng/simplify/setenvironment64.bat	2015-11-07 15:49:46 UTC (rev 8817)
@@ -90,7 +90,7 @@
 rem running
 rem ==================================================
 
-IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0_71
+IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0_80
 IF "%DOXYGEN%" == "" SET DOXYGEN=C:\Program Files\doxygen\bin
 IF "%GNUWIN32%" == "" SET GNUWIN32=C:\Program Files (x86)\GnuWin32\bin
 IF "%SEVENZ%" == "" SET SEVENZ=%MG_DEV%\BuildTools\WebTools\7-Zip