[mapguide-commits] r10075 - in branches/4.0/MgDev: . Bindings/src/IMake Oem/LinuxApt
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Jun 16 08:21:46 PDT 2024
Author: jng
Date: 2024-06-16 08:21:44 -0700 (Sun, 16 Jun 2024)
New Revision: 10075
Added:
branches/4.0/MgDev/Oem/LinuxApt/apache-tomcat-9.0.89.tar.gz
branches/4.0/MgDev/Oem/LinuxApt/apr-1.7.4.tar.bz2
branches/4.0/MgDev/Oem/LinuxApt/httpd-2.4.59.tar.bz2
branches/4.0/MgDev/Oem/LinuxApt/php-8.1.29.tar.bz2
branches/4.0/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.49-src.tar.gz
branches/4.0/MgDev/UPDATING_WEBTIER_COMPONENTS.md
Removed:
branches/4.0/MgDev/Oem/LinuxApt/apache-tomcat-9.0.73.tar.gz
branches/4.0/MgDev/Oem/LinuxApt/apr-1.7.2.tar.bz2
branches/4.0/MgDev/Oem/LinuxApt/httpd-2.4.56.tar.bz2
branches/4.0/MgDev/Oem/LinuxApt/php-8.1.17.tar.bz2
branches/4.0/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.48-src.tar.gz
Modified:
branches/4.0/MgDev/Bindings/src/IMake/
branches/4.0/MgDev/Oem/LinuxApt/CMakeLists.txt
branches/4.0/MgDev/cmake_linuxapt.sh
branches/4.0/MgDev/prepare_webtier_components.bat
Log:
Web tier component updates:
* httpd 2.4.56 -> 2.4.59
* php 8.1.17 -> 8.1.29
* tomcat 9.0.73 -> 9.0.89
* tomcat-connectors 1.2.48 -> 1.2.49
* apr 1.7.2 -> 1.7.4
Also
* Update svn ignore list on Bindings/src/IMake
* Added a UPDATING_WEBTIER_COMPONENTS.md to solidify the component update process going forward
Index: branches/4.0/MgDev/Bindings/src/IMake
===================================================================
--- branches/4.0/MgDev/Bindings/src/IMake 2024-06-07 08:44:26 UTC (rev 10074)
+++ branches/4.0/MgDev/Bindings/src/IMake 2024-06-16 15:21:44 UTC (rev 10075)
Property changes on: branches/4.0/MgDev/Bindings/src/IMake
___________________________________________________________________
Added: svn:global-ignores
## -0,0 +1 ##
+.vs
Modified: branches/4.0/MgDev/Oem/LinuxApt/CMakeLists.txt
===================================================================
--- branches/4.0/MgDev/Oem/LinuxApt/CMakeLists.txt 2024-06-07 08:44:26 UTC (rev 10074)
+++ branches/4.0/MgDev/Oem/LinuxApt/CMakeLists.txt 2024-06-16 15:21:44 UTC (rev 10075)
@@ -20,7 +20,7 @@
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tomcat)
# TODO: Offload tomcat version to top-level var
- execute_process(COMMAND tar -zxf ${CMAKE_CURRENT_SOURCE_DIR}/apache-tomcat-9.0.73.tar.gz -C ${CMAKE_CURRENT_BINARY_DIR}/tomcat --strip-components=1)
+ execute_process(COMMAND tar -zxf ${CMAKE_CURRENT_SOURCE_DIR}/apache-tomcat-9.0.89.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
Deleted: branches/4.0/MgDev/Oem/LinuxApt/apache-tomcat-9.0.73.tar.gz
===================================================================
(Binary files differ)
Added: branches/4.0/MgDev/Oem/LinuxApt/apache-tomcat-9.0.89.tar.gz
===================================================================
(Binary files differ)
Index: branches/4.0/MgDev/Oem/LinuxApt/apache-tomcat-9.0.89.tar.gz
===================================================================
--- branches/4.0/MgDev/Oem/LinuxApt/apache-tomcat-9.0.89.tar.gz 2024-06-07 08:44:26 UTC (rev 10074)
+++ branches/4.0/MgDev/Oem/LinuxApt/apache-tomcat-9.0.89.tar.gz 2024-06-16 15:21:44 UTC (rev 10075)
Property changes on: branches/4.0/MgDev/Oem/LinuxApt/apache-tomcat-9.0.89.tar.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: branches/4.0/MgDev/Oem/LinuxApt/apr-1.7.2.tar.bz2
===================================================================
(Binary files differ)
Added: branches/4.0/MgDev/Oem/LinuxApt/apr-1.7.4.tar.bz2
===================================================================
(Binary files differ)
Index: branches/4.0/MgDev/Oem/LinuxApt/apr-1.7.4.tar.bz2
===================================================================
--- branches/4.0/MgDev/Oem/LinuxApt/apr-1.7.4.tar.bz2 2024-06-07 08:44:26 UTC (rev 10074)
+++ branches/4.0/MgDev/Oem/LinuxApt/apr-1.7.4.tar.bz2 2024-06-16 15:21:44 UTC (rev 10075)
Property changes on: branches/4.0/MgDev/Oem/LinuxApt/apr-1.7.4.tar.bz2
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: branches/4.0/MgDev/Oem/LinuxApt/httpd-2.4.56.tar.bz2
===================================================================
(Binary files differ)
Added: branches/4.0/MgDev/Oem/LinuxApt/httpd-2.4.59.tar.bz2
===================================================================
(Binary files differ)
Index: branches/4.0/MgDev/Oem/LinuxApt/httpd-2.4.59.tar.bz2
===================================================================
--- branches/4.0/MgDev/Oem/LinuxApt/httpd-2.4.59.tar.bz2 2024-06-07 08:44:26 UTC (rev 10074)
+++ branches/4.0/MgDev/Oem/LinuxApt/httpd-2.4.59.tar.bz2 2024-06-16 15:21:44 UTC (rev 10075)
Property changes on: branches/4.0/MgDev/Oem/LinuxApt/httpd-2.4.59.tar.bz2
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: branches/4.0/MgDev/Oem/LinuxApt/php-8.1.17.tar.bz2
===================================================================
(Binary files differ)
Added: branches/4.0/MgDev/Oem/LinuxApt/php-8.1.29.tar.bz2
===================================================================
(Binary files differ)
Index: branches/4.0/MgDev/Oem/LinuxApt/php-8.1.29.tar.bz2
===================================================================
--- branches/4.0/MgDev/Oem/LinuxApt/php-8.1.29.tar.bz2 2024-06-07 08:44:26 UTC (rev 10074)
+++ branches/4.0/MgDev/Oem/LinuxApt/php-8.1.29.tar.bz2 2024-06-16 15:21:44 UTC (rev 10075)
Property changes on: branches/4.0/MgDev/Oem/LinuxApt/php-8.1.29.tar.bz2
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: branches/4.0/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.48-src.tar.gz
===================================================================
(Binary files differ)
Added: branches/4.0/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.49-src.tar.gz
===================================================================
(Binary files differ)
Index: branches/4.0/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.49-src.tar.gz
===================================================================
--- branches/4.0/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.49-src.tar.gz 2024-06-07 08:44:26 UTC (rev 10074)
+++ branches/4.0/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.49-src.tar.gz 2024-06-16 15:21:44 UTC (rev 10075)
Property changes on: branches/4.0/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.49-src.tar.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/4.0/MgDev/UPDATING_WEBTIER_COMPONENTS.md
===================================================================
--- branches/4.0/MgDev/UPDATING_WEBTIER_COMPONENTS.md (rev 0)
+++ branches/4.0/MgDev/UPDATING_WEBTIER_COMPONENTS.md 2024-06-16 15:21:44 UTC (rev 10075)
@@ -0,0 +1,110 @@
+# In `MgDev/Oem/LinuxApt`
+
+> To avoid `svn add`-ing the wrong files, you should delete all unversioned files in this directory before proceeding
+
+ * Update and replace the tarballs for
+ * `apache-tomcat`
+ * `apr`
+ * `apr-util`
+ * `httpd`
+ * `php`
+ * `tomcat-connectors`
+
+ * `svn add` the new tarballs and `svn delete` the old ones
+
+ * For the above tarballs make sure it is the following:
+ * `.tar.gz`
+ * `apache-tomcat`
+ * `tomcat-connectors`
+ * `.tar.bz2`
+ * `apr`
+ * `apr-util`
+ * `httpd`
+ * `php`
+
+ * For `tomcat`, `httpd` and `php`, only update to the latest release in that series. Do not update to a new major version unless that is planned for (ie. The current major version has entered EOL). As of writing this document, the current major release versions are:
+ * `apache-tomcat` - `9.0.x`
+ * `httpd` - `2.4.x`
+ * `php` - `8.1.x`
+
+ * Update `CMakeLists.txt`
+ * Update referenced tomcat version number
+ * Stretch goal: Maybe address the TODO within and offload the tomcat version to a top-level variable to avoid having to edit this file in the future :-)
+
+# In the `MgDev` root
+
+ * Update `cmake_linuxapt.sh`
+ * Update the various tarball version numbers referenced in this script
+
+ * Update `prepare_webtier_components.bat`
+ * Update the `HTTP_VER` variable to match new tarball version
+
+# In the `Installer/Support/Web/x64`
+
+> These instructions may require changes if we a updating to a new major version of `php` or `httpd`
+
+ * Download new zip versions of `httpd` and `php` from:
+ * `httpd` - https://www.apachelounge.com/download/
+ * Download the VS17 build
+ * `php` - https://windows.php.net/
+ * Download the NTS build
+
+ * Check `MODULE_VERSIONS.txt` to see if downloading new module versions of `mod_fcgid.so` or `mod_jk.so` are required. If new download is required, download the `.zip` package of the respective module from apachelounge, extract the `.so` within to this folder, overwriting existing files
+ * If new files downloaded, update the `MODULE_VERSIONS.txt` file to indicate the new versions
+
+ * `svn add` the new files and `svn delete` the old ones
+
+# In the `Installer` root
+
+ * Update `build.bat`
+ * Update various variables under the `Web Dependencies` section to reflect new package versions
+
+# In `Installer/Bootstrapper`
+
+> These instructions are only applicable while Microsoft adheres to binary compatibility of MSVC 2015+ compiled binaries and provides a unified vcredist installer to cover all these compiler versions
+
+ * Download the latest vcredist from: https://aka.ms/vs/17/release/vc_redist.x64.exe
+ * This is only needed if:
+ * If MapGuide/FDO updated their default MSVC compiler version (currently VS16 - MSVC 2019)
+ * If we updated a web tier component that is built with a MSVC compiler version > our MapGuide/FDO version (eg. VS17 build of `httpd` from apachelounge because they no longer VS16 builds)
+
+# Expected svn changes before commit
+
+> As `MgDev` and `Installer` are generally expected to be in 2 separate checkouts (at least for this author), this will generally span across 2 svn commits instead of one
+
+ * `MgDev`
+ * Added
+ * `Oem/LinuxApt/*.tar.gz` (new tarballs)
+ * `Oem/LinuxApt/*.tar.bz2` (new tarballs)
+ * Deleted
+ * `Oem/LinuxApt/*.tar.gz` (old tarballs)
+ * `Oem/LinuxApt/*.tar.bz2` (old tarballs)
+ * Modified
+ * `cmake_linuxapt.sh`
+ * `prepare_webtier_components.txt`
+ * `Oem/LinuxApt/CMakeLists.txt`
+
+ * `Installer`
+ * Added
+ * `Support/Web/x64/*.zip` (new files)
+ * Deleted
+ * `Support/Web/x64/*.zip` (old files)
+ * Modified
+ * `Bootstrapper/vc_redist.x64.exe` (if updated vcredist)
+ * `Support/Web/x64/mod_fcgid.so` (if updated `mod_fcgid`)
+ * `Support/Web/x64/mod_jk.so` (if updated `mod_jk`)
+ * `Support/Web/x64/MODULE_VERSIONS.txt` (if updated `mod_fcgid` or `mod_jk`)
+ * `build.bat`
+
+## Suggested commit message format
+
+```
+[Installer/Web Tier] component updates
+
+ * httpd [old version] -> [new version]
+ * php [old version] -> [new version]
+ * apr [old version] -> [new version]
+ * apr-util [old version] -> [new version]
+ * tomcat [old version] -> [new version]
+ * tomcat-connectors [old version] -> [new version]
+```
\ No newline at end of file
Modified: branches/4.0/MgDev/cmake_linuxapt.sh
===================================================================
--- branches/4.0/MgDev/cmake_linuxapt.sh 2024-06-07 08:44:26 UTC (rev 10074)
+++ branches/4.0/MgDev/cmake_linuxapt.sh 2024-06-16 15:21:44 UTC (rev 10075)
@@ -119,10 +119,10 @@
echo "Created LinuxApt working dir at: $LINUXAPT_WORK_DIR"
fi
-PHP_VER=8.1.17
-HTTPD_VER=2.4.56
-TC_VER=1.2.48
-APR_VER=1.7.2
+PHP_VER=8.1.29
+HTTPD_VER=2.4.59
+TC_VER=1.2.49
+APR_VER=1.7.4
APR_UTIL_VER=1.6.3
HTTPD_PORT=8008
Modified: branches/4.0/MgDev/prepare_webtier_components.bat
===================================================================
--- branches/4.0/MgDev/prepare_webtier_components.bat 2024-06-07 08:44:26 UTC (rev 10074)
+++ branches/4.0/MgDev/prepare_webtier_components.bat 2024-06-16 15:21:44 UTC (rev 10075)
@@ -1,6 +1,6 @@
@echo off
SET SEVENZ=%CD%\BuildTools\WebTools\7-zip\7z.exe
-SET HTTPD_VER=2.4.56
+SET HTTPD_VER=2.4.59
pushd Oem\LinuxApt
:check_httpd
if not exist httpd-%HTTPD_VER% goto unpack_httpd
More information about the mapguide-commits
mailing list