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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to