[mapguide-commits] r6541 - trunk/Installer

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-03-09 05:26:34 -0800 (Fri, 09 Mar 2012)
New Revision: 6541

Modified:
   trunk/Installer/build.bat
   trunk/Installer/build64.bat
Log:
#1805: Fix incorrect tomcat file list being prepared. Java configuration is still fubar

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2012-03-09 10:28:47 UTC (rev 6540)
+++ trunk/Installer/build.bat	2012-03-09 13:26:34 UTC (rev 6541)
@@ -231,16 +231,18 @@
 7z x %HTTPD_PACKAGE% -y -o"%MG_SOURCE%\Web\Apache2"
 popd
 echo [prepare] Unpack Tomcat
-pushd "%MG_SOURCE%\Web"
-rd /S /Q Tomcat
-popd
 pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
 copy /Y mod_jk.so "%MG_SOURCE%\Web\Apache2\modules"
 REM we unpack to root because Tomcat is the root dir in the zip file
 7z x %TOMCAT_PACKAGE% -y -o"%MG_SOURCE%\Web"
 popd
 pushd "%MG_SOURCE%\Web"
+if exist Tomcat (
+xcopy /S /Y apache-tomcat-7.0.23\*.* Tomcat
+rd /S /Q apache-tomcat-7.0.23
+) else (
 rename apache-tomcat-7.0.23 Tomcat
+)
 popd
 echo [prepare] Unpack PHP (Thread Safe)
 pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"

Modified: trunk/Installer/build64.bat
===================================================================
--- trunk/Installer/build64.bat	2012-03-09 10:28:47 UTC (rev 6540)
+++ trunk/Installer/build64.bat	2012-03-09 13:26:34 UTC (rev 6541)
@@ -253,16 +253,18 @@
 7z x %HTTPD_PACKAGE% -y -o"%MG_SOURCE%\Web\Apache2"
 popd
 echo [prepare] Unpack Tomcat
-pushd "%MG_SOURCE%\Web"
-rd /S /Q Tomcat
-popd
 pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
 copy /Y mod_jk.so "%MG_SOURCE%\Web\Apache2\modules"
 REM we unpack to root because Tomcat is the root dir in the zip file
 7z x %TOMCAT_PACKAGE% -y -o"%MG_SOURCE%\Web"
 popd
 pushd "%MG_SOURCE%\Web"
+if exist Tomcat (
+xcopy /S /Y apache-tomcat-7.0.23\*.* Tomcat
+rd /S /Q apache-tomcat-7.0.23
+) else (
 rename apache-tomcat-7.0.23 Tomcat
+)
 popd
 echo [prepare] Unpack PHP (Thread Safe)
 pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"