[mapguide-commits] r8816 - trunk/MgDev

[svn_mapguide at osgeo.org]

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

Modified:
   trunk/MgDev/build.bat
   trunk/MgDev/setenvironment.bat
   trunk/MgDev/setenvironment64.bat
Log:
Update build.bat and setenvironment[64].bat to match current build environment

Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat	2015-11-07 15:35:03 UTC (rev 8815)
+++ trunk/MgDev/build.bat	2015-11-07 15:39:46 UTC (rev 8816)
@@ -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: trunk/MgDev/setenvironment.bat
===================================================================
--- trunk/MgDev/setenvironment.bat	2015-11-07 15:35:03 UTC (rev 8815)
+++ trunk/MgDev/setenvironment.bat	2015-11-07 15:39:46 UTC (rev 8816)
@@ -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: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat	2015-11-07 15:35:03 UTC (rev 8815)
+++ trunk/MgDev/setenvironment64.bat	2015-11-07 15:39:46 UTC (rev 8816)
@@ -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