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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-05-02 11:19:01 -0700 (Sat, 02 May 2015)
New Revision: 8652

Modified:
   sandbox/jng/diet_oem/build.bat
   sandbox/jng/diet_oem/setenvironment.bat
Log:
Expose directories for CS-Map dictionaries and 7-zip in setenvironment.bat
Be more graceful with configuration casing in build.bat

Modified: sandbox/jng/diet_oem/build.bat
===================================================================
--- sandbox/jng/diet_oem/build.bat	2015-05-02 17:19:30 UTC (rev 8651)
+++ sandbox/jng/diet_oem/build.bat	2015-05-02 18:19:01 UTC (rev 8652)
@@ -41,8 +41,16 @@
 
 :get_config
 SET MG_OEM_CONFIG=%2
-if "%2"=="debug" goto next_param
-if "%2"=="release" goto next_param
+if "%2"=="Debug" goto next_param
+if "%2"=="debug" (
+    SET MG_OEM_CONFIG=Debug
+    goto next_param
+)
+if "%2"=="Release" goto next_param
+if "%2"=="release" (
+    SET MG_OEM_CONFIG=Release
+    goto next_param
+)
 SET ERRORMSG=Unrecognised config: %2
 goto custom_error
 

Modified: sandbox/jng/diet_oem/setenvironment.bat
===================================================================
--- sandbox/jng/diet_oem/setenvironment.bat	2015-05-02 17:19:30 UTC (rev 8651)
+++ sandbox/jng/diet_oem/setenvironment.bat	2015-05-02 18:19:01 UTC (rev 8652)
@@ -79,7 +79,8 @@
     SET MG_OEM_JSONCPP_DEBUG_SUFFIX=
 )
 
-SET SEVENZ=%CD%\WebTools\7-zip\7z.exe
+SET SEVENZ_DIR=%CD%\WebTools\7-zip
+SET SEVENZ=%SEVENZ_DIR%\7z.exe
 SET MG_OEM_HTTPD_VER=2.4.10
 SET MG_OEM_PHP_VER=5.5.17
 
@@ -165,6 +166,7 @@
 SET MG_OEM_CSMAP_INC_DIR=%CD%\CsMap\Include
 SET MG_OEM_CSMAP_LIB_DIR=%CD%\CsMap\lib110\%MG_OEM_CONFIG%%MG_OEM_PLAT_SHORT%
 SET MG_OEM_CSMAP_LIBS=csmap%MG_OEM_CSMAP_DEBUG_SUFFIX%.lib
+SET MG_OEM_CSMAP_DICT_DIR=%CD%\CsMap\Dictionaries
 REM ==================== DBXML ========================
 SET MG_OEM_DBXML_INC_DIR=%CD%\dbxml\include\dbxml
 SET MG_OEM_DBXML_LIB_DIR=%CD%\dbxml\lib%MG_OEM_PLAT_SHORT%\%MG_OEM_CONFIG%
@@ -242,6 +244,10 @@
     SET ERRORMSG=No such path: MG_OEM_CPPUNIT_LIB_DIR [%MG_OEM_CPPUNIT_LIB_DIR%]
     goto custom_error_no_help
 )
+if not exist %MG_OEM_CSMAP_DICT_DIR% (
+    SET ERRORMSG=No such path: MG_OEM_CSMAP_DICT_DIR [%MG_OEM_CSMAP_DICT_DIR%]
+    goto custom_error_no_help
+)
 if not exist %MG_OEM_CSMAP_INC_DIR% (
     SET ERRORMSG=No such path: MG_OEM_CSMAP_INC_DIR [%MG_OEM_CSMAP_INC_DIR%]
     goto custom_error_no_help
@@ -310,6 +316,7 @@
 echo MG_OEM_CSMAP_INC_DIR = %MG_OEM_CSMAP_INC_DIR%
 echo MG_OEM_CSMAP_LIB_DIR = %MG_OEM_CSMAP_LIB_DIR%
 echo MG_OEM_CSMAP_LIBS = %MG_OEM_CSMAP_LIBS%
+echo MG_OEM_CSMAP_DICT_DIR = %MG_OEM_CSMAP_DICT_DIR%
 echo ==================== DBXML ========================
 echo MG_OEM_DBXML_INC_DIR = %MG_OEM_DBXML_INC_DIR%
 echo MG_OEM_DBXML_LIB_DIR = %MG_OEM_DBXML_LIB_DIR%