[mapguide-commits] r9727 - in trunk/MgDev: . Oem/LinuxApt

[svn_mapguide at osgeo.org]

Author: jng
Date: 2020-09-10 03:57:37 -0700 (Thu, 10 Sep 2020)
New Revision: 9727

Modified:
   trunk/MgDev/Oem/LinuxApt/CMakeLists.txt
   trunk/MgDev/Oem/LinuxApt/build_apt.sh
   trunk/MgDev/cmake_linuxapt.sh
Log:
#2818: Fix up more TC version numbers

Modified: trunk/MgDev/Oem/LinuxApt/CMakeLists.txt
===================================================================
--- trunk/MgDev/Oem/LinuxApt/CMakeLists.txt	2020-09-10 10:44:51 UTC (rev 9726)
+++ trunk/MgDev/Oem/LinuxApt/CMakeLists.txt	2020-09-10 10:57:37 UTC (rev 9727)
@@ -19,7 +19,7 @@
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tomcat.conf DESTINATION ${MG_INSTALL_WEB_PREFIX}/apache2/conf/mapguide COMPONENT ${MG_COMPONENT})
 
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tomcat)
-    execute_process(COMMAND tar -zxf ${CMAKE_CURRENT_SOURCE_DIR}/apache-tomcat-7.0.92.tar.gz -C ${CMAKE_CURRENT_BINARY_DIR}/tomcat --strip-components=1)
+    execute_process(COMMAND tar -zxf ${CMAKE_CURRENT_SOURCE_DIR}/apache-tomcat-9.0.37.tar.gz -C ${CMAKE_CURRENT_BINARY_DIR}/tomcat --strip-components=1)
 
     configure_file(${CMAKE_MODULE_PATH}/../configs/mapguide.xml.in ${CMAKE_CURRENT_BINARY_DIR}/tomcat/conf/Catalina/localhost/mapguide.xml)
     # Don't overwrite startup.sh in the CMAKE_CURRENT_BINARY_DIR as the subseqent install will do the same thing

Modified: trunk/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- trunk/MgDev/Oem/LinuxApt/build_apt.sh	2020-09-10 10:44:51 UTC (rev 9726)
+++ trunk/MgDev/Oem/LinuxApt/build_apt.sh	2020-09-10 10:57:37 UTC (rev 9727)
@@ -1,4 +1,3 @@
-#
 #! /bin/bash
 #
 

Modified: trunk/MgDev/cmake_linuxapt.sh
===================================================================
--- trunk/MgDev/cmake_linuxapt.sh	2020-09-10 10:44:51 UTC (rev 9726)
+++ trunk/MgDev/cmake_linuxapt.sh	2020-09-10 10:57:37 UTC (rev 9727)
@@ -121,7 +121,7 @@
 
 PHP_VER=5.6.40
 HTTPD_VER=2.4.37
-TC_VER=1.2.46
+TC_VER=1.2.48
 APR_VER=1.6.5
 APR_UTIL_VER=1.6.1