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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-05-04 04:52:45 -0700 (Mon, 04 May 2015)
New Revision: 8657

Modified:
   sandbox/jng/diet_oem/setenvironment.bat
Log:
Workaround batch file parentheses shenanigans

Modified: sandbox/jng/diet_oem/setenvironment.bat
===================================================================
--- sandbox/jng/diet_oem/setenvironment.bat	2015-05-03 15:47:21 UTC (rev 8656)
+++ sandbox/jng/diet_oem/setenvironment.bat	2015-05-04 11:52:45 UTC (rev 8657)
@@ -225,11 +225,15 @@
 SET MG_OEM_IMAKE_BIN_DIR=%CD%\WebTools\IMake\Win32
 REM ==================== JAVA =========================
 
-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
-)
+SET DEFAULT_JAVA_HOME_32=C:\Program Files (x86)\Java\jdk1.7.0_80
+SET DEFAULT_JAVA_HOME_64=C:\Program Files\Java\jdk1.7.0_80
+IF "%JAVA_HOME%" == "" goto set_default_java
+goto check_paths
+:set_default_java
+    SET JAVA_HOME=%DEFAULT_JAVA_HOME_32%
+    if "%MG_OEM_PLATFORM%"=="x64" SET JAVA_HOME=%DEFAULT_JAVA_HOME_64%
 
+:check_paths
 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%]