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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-05-26 06:06:35 -0700 (Tue, 26 May 2015)
New Revision: 8676

Modified:
   sandbox/jng/diet_oem/setenvironment.bat
Log:
Set tomcat package name for installer scripts to pick up

Modified: sandbox/jng/diet_oem/setenvironment.bat
===================================================================
--- sandbox/jng/diet_oem/setenvironment.bat	2015-05-22 09:28:40 UTC (rev 8675)
+++ sandbox/jng/diet_oem/setenvironment.bat	2015-05-26 13:06:35 UTC (rev 8676)
@@ -83,6 +83,7 @@
 SET SEVENZ=%SEVENZ_DIR%\7z.exe
 SET MG_OEM_HTTPD_VER=2.4.10
 SET MG_OEM_PHP_VER=5.5.17
+SET MG_OEM_TOMCAT_VER=7.0.56
 
 REM ==================== HTTPD ========================
 SET MG_OEM_HTTPD_ROOT=%CD%\LinuxApt\httpd-%MG_OEM_HTTPD_VER%
@@ -96,6 +97,9 @@
 SET MG_OEM_PHP_LIB_DIR=%CD%\php\Release_TS
 )
 SET MG_OEM_PHP_LIBS=php5ts.lib
+REM ==================== Tomcat =======================
+SET MG_OEM_TOMCAT_PACKAGE_NAME=apache-tomcat-%MG_OEM_TOMCAT_VER%
+SET MG_OEM_TOMCAT_PACKAGE=%CD%\LinuxApt\%MG_OEM_TOMCAT_PACKAGE_NAME%.tar.gz
 
 :check_httpd
 if not exist %MG_OEM_HTTPD_ROOT% goto unpack_httpd
@@ -307,6 +311,7 @@
     SET ERRORMSG=No such path: MG_OEM_IMAKE_BIN_DIR [%MG_OEM_IMAKE_BIN_DIR%]
     goto custom_error_no_help
 )
+if not exist %MG_OEM_TOMCAT_PACKAGE% echo [warning]: The tomcat package does not exist (%MG_OEM_TOMCAT_PACKAGE%). Building installers may fail
 
 echo ========= Environment Variable Summary ============
 echo Platform: %MG_OEM_PLATFORM%
@@ -378,7 +383,9 @@
 echo MG_OEM_IMAKE_BIN_DIR = %MG_OEM_IMAKE_BIN_DIR%
 echo ==================== JAVA =========================
 echo JAVA_HOME = %JAVA_HOME%
-echo ===================================================
+echo ==================== TOMCAT =======================
+echo MG_OEM_TOMCAT_PACKAGE_NAME = %MG_OEM_TOMCAT_PACKAGE_NAME%
+echo MG_OEM_TOMCAT_PACKAGE = %MG_OEM_TOMCAT_PACKAGE%
 goto quit
 
 :custom_error_no_help