[ jEdit-commits ] [ jEdit core ]jEdit jEdit plugin branch master updated. v5.7.0-13-ge7bba0b3b

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "jEdit jEdit plugin".

The branch, master has been updated
       via  e7bba0b3b4e9a337cae64e6e217e3efbfa0fe337 (commit)
       via  03596d317b52a7152aefa3731e081268c3c53cef (commit)
      from  998bce256c6a08e5ab1b74c90553ca549191db80 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit: https://sourceforge.net/p/jedit/jEdit/ci/e7bba0b3b4e9a337cae64e6e217e3efbfa0fe337/
tree: https://sourceforge.net/p/jedit/jEdit/ci/e7bba0b3b4e9a337cae64e6e217e3efbfa0fe337/tree/

commit e7bba0b3b4e9a337cae64e6e217e3efbfa0fe337
Author: Björn Kautler <Bj...@Ka...>
Date:   Mon Mar 17 05:18:29 2025 +0100

    Work around hdiutil problem on newer macOS

diff --git a/build.xml b/build.xml
index 3294b969e..9928ed7fc 100644
--- a/build.xml
+++ b/build.xml
@@ -1263,15 +1263,18 @@
 			<fileset dir="${dist.dir}"
 				 includes="*${mac.disk.image.filename}"/>
 		</delete>
-		<exec executable="hdiutil"
-		      failonerror="true">
-			<arg value="create"/>
-			<arg value="-volname"/>
-			<arg value="jEdit"/>
-			<arg value="-srcfolder"/>
-			<arg file="${dist.dir}/classes/mac"/>
-			<arg file="${dist.dir}/orig-${mac.disk.image.filename}"/>
-		</exec>
+		<!-- work-around for https://github.com/actions/runner-images/issues/7522 -->
+		<retry retrycount="3" retrydelay="1000">
+			<exec executable="hdiutil"
+				  failonerror="true">
+				<arg value="create"/>
+				<arg value="-volname"/>
+				<arg value="jEdit"/>
+				<arg value="-srcfolder"/>
+				<arg file="${dist.dir}/classes/mac"/>
+				<arg file="${dist.dir}/orig-${mac.disk.image.filename}"/>
+			</exec>
+		</retry>
 		<exec executable="hdiutil"
 		      failonerror="true">
 			<arg value="convert"/>

commit: https://sourceforge.net/p/jedit/jEdit/ci/03596d317b52a7152aefa3731e081268c3c53cef/
tree: https://sourceforge.net/p/jedit/jEdit/ci/03596d317b52a7152aefa3731e081268c3c53cef/tree/

commit 03596d317b52a7152aefa3731e081268c3c53cef
Author: Björn Kautler <Bj...@Ka...>
Date:   Mon Mar 17 05:17:45 2025 +0100

    Fix number-format problem when building exe launcher

diff --git a/build.xml b/build.xml
index d4ea77222..3294b969e 100644
--- a/build.xml
+++ b/build.xml
@@ -167,6 +167,7 @@
 			          + (beta != 99 ? "pre" + beta : "." + micro);
 			project.setUserProperty("jedit.version", version);
 			project.setUserProperty("jedit.build.number", build);
+			project.setUserProperty("jedit.build.number.no.leading.zeros", major + "." + minor + "." + beta + "." + micro);
 			project.setUserProperty("jedit.version.final", Boolean.toString(beta == 99));
 		</script>
 		<property name="dist.jar.filename"
@@ -1416,6 +1417,8 @@
 					value="${jar.filename}"/>
 				<filter token="jedit.build.number"
 					value="${jedit.build.number}"/>
+				<filter token="jedit.build.number.no.leading.zeros"
+					value="${jedit.build.number.no.leading.zeros}"/>
 				<filter token="jedit.version"
 					value="${jedit.version}"/>
 				<filter token="target.java.version"
diff --git a/package-files/windows/jedit.launch4j.xml b/package-files/windows/jedit.launch4j.xml
index fd326365a..b920eb228 100644
--- a/package-files/windows/jedit.launch4j.xml
+++ b/package-files/windows/jedit.launch4j.xml
@@ -36,11 +36,11 @@
 		<minVersion>@target.java.version@</minVersion>
 	</jre>
 	<versionInfo>
-		<fileVersion>@jedit.build.number@</fileVersion>
+		<fileVersion>@jedit.build.number.no.leading.zeros@</fileVersion>
 		<txtFileVersion>@jedit.version@</txtFileVersion>
 		<fileDescription>jEdit - Programmer&apos;s Text Editor</fileDescription>
 		<copyright>Copyright © 19...@cu...@ Contributors</copyright>
-		<productVersion>@jedit.build.number@</productVersion>
+		<productVersion>@jedit.build.number.no.leading.zeros@</productVersion>
 		<txtProductVersion>@jedit.version@</txtProductVersion>
 		<productName>jEdit</productName>
 		<companyName>Contributors</companyName>

-----------------------------------------------------------------------

Summary of changes:
 build.xml                                | 24 +++++++++++++++---------
 package-files/windows/jedit.launch4j.xml |  4 ++--
 2 files changed, 17 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
jEdit jEdit plugin