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 16:19:34 UTC
(tomcat) branch 11.0.x updated (3b9d58ab60 -> 95ca458060)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 3b9d58ab60 Format
new 7a50b40e4f Fix version check
new b1cddaedaa Add target for local makensis build
new 95ca458060 Update instructions
The 3 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:
BUILDING.txt | 20 +++++++++++---------
build.xml | 37 +++++++++++++++++++++++++++++++++++--
2 files changed, 46 insertions(+), 11 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 02/03: Add target for local makensis build
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b1cddaedaa40087d73e49f182cf7882126676655
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 4 16:13:19 2025 +0000
Add target for local makensis build
---
build.xml | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/build.xml b/build.xml
index d2be098bf0..75accd5690 100644
--- a/build.xml
+++ b/build.xml
@@ -2756,6 +2756,39 @@ You may need a custom build of makensis. Instructions for this may be found in B
<move file="${codesigning.file_to_sign}.sig" tofile="res/install-win/Uninstall.exe.sig"/>
</target>
+ <target name="-local-makensis-set-properties">
+ <property environment="env"/>
+ <condition property="scons.ok">
+ <available file="scons" filepath="${env.PATH}"/>
+ </condition>
+ <condition property="local.makensis.ok">
+ <isset property="scons.ok"/>
+ </condition>
+ </target>
+
+ <target name="-local-makensis-check"
+ depends="-local-makensis-set-properties"
+ unless="${local.makensis.ok}">
+ <echo message="Unable to build local version of makensis. All following checks must pass."/>
+ <echo message=" Found scons on path: ${scons.ok}"/>
+ </target>
+
+ <target name="local-makensis"
+ description="Builds a local version of makensis with the same version as the equivalent Windows executable"
+ depends="-local-makensis-check"
+ if="${local.makensis.ok}">
+ <exec executable="scons" dir="${nsis.src.home}">
+ <arg value="UNICODE=yes"/>
+ <arg value="PREFIX=${nsis.bin.home}/Bin"/>
+ <arg value="SKIPPLUGINS=all"/>
+ <arg value="SKIPUTILS=all"/>
+ <arg value="SKIPMISC=all"/>
+ <arg value="NSIS_CONFIG_CONST_DATA_PATH=no"/>
+ <arg value="VERSION=${nsis.version}"/>
+ <arg value="install-compiler"/>
+ </exec>
+ </target>
+
<target name="release-version-check">
<fail message="Java version ${release.java.version} or newer is required for release (${java.version} is installed)">
<condition>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 03/03: Update instructions
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 95ca458060f8cb139ca3ad8c557377b4c9548a8e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 4 16:18:50 2025 +0000
Update instructions
---
BUILDING.txt | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index a840ddfaf8..6ca9e5dada 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -320,6 +320,7 @@ in build.xml and the default property values in build.properties.default.
# Code signing of Windows installer
do.codesigning=true
codesigning.storepass=request-via-pmc
+ codesigning.keypass=request-via-pmc
Release managers will be provided with the necessary credentials by the PMC.
@@ -327,15 +328,20 @@ in build.xml and the default property values in build.properties.default.
you can use the detached signatures provided in the official releases.
In this case you have to use the sources from the source release
archive, which contains these signatures. You also have to build
- on Windows, or use Wine, or use a special build of makensis to
- create a reproducible installer, that fits the signature files.
+ on Windows, use Wine, or use a special build of makensis to create
+ a reproducible installer, that fits the signature files.
5. Using a special "makensis" build on non-Windows (optional)
If you want to build a reproducible installer on non-Windows
by using "makensis" instead of "Wine", you need to build
- "makensis" from a source download yourself using the following
- recipe. To build makensis, you need python, scons and a C compiler.
+ "makensis" from a source download yourself. To build "makensis",
+ you need python, scons and a C compiler. You can build "makensis"
+ via an Ant target:
+
+ ant local-makensis
+
+ or you can build it manually using the following recipe.
First detect the needed version by looking for nsis.version
in build.properties.default.
@@ -351,10 +357,9 @@ in build.xml and the default property values in build.properties.default.
Install the scons Python software construction tool.
- Run the following command in the extracted NSIS source directory and set PATH:
+ Run the following command in the extracted NSIS source directory:
scons UNICODE=yes PREFIX=${base.path}/nsis-${nsis.version}/Bin SKIPPLUGINS=all SKIPUTILS=all SKIPMISC=all NSIS_CONFIG_CONST_DATA_PATH=no VERSION=${nsis.version} install-compiler
- export PATH=$PATH:${base.path}/nsis-${nsis.version}/Bin
You need to specify the correct value in VERSION (this ends up in the installer binary
so it needs to match). The PREFIX is not important, but you need to make sure
@@ -362,9 +367,6 @@ in build.xml and the default property values in build.properties.default.
the NSIS binary distribution that "ant download-dist" installed. When using
"NSIS_CONFIG_CONST_DATA_PATH=no" the binary is independent of the value of "PREFIX".
- Use this "makensis" binary to make sure that it gets found after setting
- the PATH environment variable.
-
In addition set the ant property "nsis.tool" to "makensis" in
build.properties.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 01/03: Fix version check
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7a50b40e4fb94b6bc8ad367bd6d05f6e88416dbf
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 4 16:12:39 2025 +0000
Fix version check
---
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 386c6fed06..d2be098bf0 100644
--- a/build.xml
+++ b/build.xml
@@ -2606,7 +2606,7 @@
<condition property="nsis.executable.unix.version.ok">
<or>
<os family="windows"/>
- <equals arg1="nsis.version" arg2="nsis.executable.unix.version"/>
+ <equals arg1="v${nsis.version}" arg2="${nsis.executable.unix.version}"/>
<not>
<!-- Zero length string for version.dev indicates a release build -->
<equals arg1="${version.dev}" arg2=""/>
@@ -2628,7 +2628,7 @@ To skip building the Windows installer, set the skip.installer property in build
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
+with version [${nsis.executable.unix.version}] but version [v${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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org