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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-05-03 08:47:21 -0700 (Sun, 03 May 2015)
New Revision: 8656

Modified:
   sandbox/jng/diet_oem/setenvironment.bat
Log:
Only set JAVA_HOME if not set

Modified: sandbox/jng/diet_oem/setenvironment.bat
===================================================================
--- sandbox/jng/diet_oem/setenvironment.bat	2015-05-03 15:29:37 UTC (rev 8655)
+++ sandbox/jng/diet_oem/setenvironment.bat	2015-05-03 15:47:21 UTC (rev 8656)
@@ -224,9 +224,12 @@
 REM ==================== IMAKE ========================
 SET MG_OEM_IMAKE_BIN_DIR=%CD%\WebTools\IMake\Win32
 REM ==================== JAVA =========================
-SET JAVA_HOME=C:\Program Files (x86)\Java\jdk1.7.0_80
-if "%MG_OEM_PLATFORM%"=="x64" SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0_80
 
+IF "%JAVA_HOME%" == "" (
+    SET JAVA_HOME=C:\Program Files (x86)\Java\jdk1.7.0_80
+    if "%MG_OEM_PLATFORM%"=="x64" SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0_80
+)
+
 REM Path sanity checking
 if not exist %MG_OEM_ACE_INC_DIR% (
     SET ERRORMSG=No such path: MG_OEM_ACE_INC_DIR [%MG_OEM_ACE_INC_DIR%]