You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2025/03/04 15:41:41 UTC
(tomcat) branch 10.1.x updated (dc12817606 -> a3957059e8)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from dc12817606 Support platform or custom makensis on unix/linux/etc
new 1546e20b3d Add a makensis version check for release builds
new a3957059e8 Format
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 44 ++++++++++++++++++++++++++++++++++++++------
1 file changed, 38 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 02/02: Format
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a3957059e8b59f019afa23de88cc8e5b02cfb126
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 4 15:37:51 2025 +0000
Format
---
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 32f76cf560..f5e9e6907a 100644
--- a/build.xml
+++ b/build.xml
@@ -2649,7 +2649,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
<fail message="The executable ${nsis.tool} was not found on the current path.
Either wine or makensis are required to build the Windows installer on a non-Windows platform.
Choose the tool by setting property nsis.tool in build.properties.
-To skip building the Windows installer, set the skip.installer property in build.properties" />
+To skip building the Windows installer, set the skip.installer property in build.properties"/>
</target>
<target name="-installer-check-version"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 01/02: Add a makensis version check for release builds
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1546e20b3dda90fb5af9c84b4f1cc55d60665d6f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 4 15:31:52 2025 +0000
Add a makensis version check for release builds
---
build.xml | 42 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 37 insertions(+), 5 deletions(-)
diff --git a/build.xml b/build.xml
index 7422575690..32f76cf560 100644
--- a/build.xml
+++ b/build.xml
@@ -2594,7 +2594,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
</copy>
</target>
- <target name="-installer-pre-init">
+ <target name="-installer-set-properties-1">
<property environment="env"/>
<condition property="wine.ok">
<or>
@@ -2625,8 +2625,26 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
</condition>
</target>
- <target name="-installer-init"
- depends="-installer-pre-init"
+ <target name="-installer-set-properties-2"
+ depends="-installer-set-properties-1"
+ if="nsis.executable.unix">
+ <exec executable="${nsis.executable.unix}" outputproperty="nsis.executable.unix.version">
+ <arg value="-VERSION"/>
+ </exec>
+ <condition property="nsis.executable.unix.version.ok">
+ <or>
+ <os family="windows"/>
+ <equals arg1="nsis.version" arg2="nsis.executable.unix.version"/>
+ <not>
+ <!-- Zero length string for version.dev indicates a release build -->
+ <equals arg1="${version.dev}" arg2=""/>
+ </not>
+ </or>
+ </condition>
+ </target>
+
+ <target name="-installer-check-available"
+ depends="-installer-set-properties-1"
unless="${installer.ok}">
<fail message="The executable ${nsis.tool} was not found on the current path.
Either wine or makensis are required to build the Windows installer on a non-Windows platform.
@@ -2634,8 +2652,22 @@ Choose the tool by setting property nsis.tool in build.properties.
To skip building the Windows installer, set the skip.installer property in build.properties" />
</target>
+ <target name="-installer-check-version"
+ depends="-installer-set-properties-2"
+ unless="${nsis.executable.unix.version.ok}">
+ <fail message="An executable makensis was found at: ${nsis.executable.unix}
+with version [${nsis.executable.unix.version}] but version [${nsis.version}] is required
+for repeatable builds.
+You may need a custom build of makensis. Instructions for this may be found in BUILDING.txt"/>
+ </target>
+
+ <target name="-installer-checks"
+ depends="-installer-check-available,-installer-check-version"
+ unless="${installer.ok}">
+ </target>
+
<target name="-installer-prep"
- depends="dist-static,-installer-init"
+ depends="dist-static,-installer-checks"
unless="skip.installer">
<copy todir="${tomcat.dist}">
<fileset dir="res/install-win">
@@ -2673,7 +2705,7 @@ To skip building the Windows installer, set the skip.installer property in build
</target>
<target name="-installer-makensis" if="nsis.executable.unix">
- <echo message="Using makensis: ${nsis.executable.unix}"/>
+ <echo message="Using makensis: ${nsis.executable.unix} version [${nsis.executable.unix.version}]"/>
<exec dir="${tomcat.dist}" executable="${nsis.executable.unix}" osfamily="unix">
<arg value="-DNSISDIR=${nsis.bin.home}"/>
<arg value="-V2"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org