[ jEdit-commits ] SF.net SVN: jedit:[25700] jEdit/trunk

[<vam...@us...>]

Revision: 25700
          http://sourceforge.net/p/jedit/svn/25700
Author:   vampire0
Date:     2023-11-17 02:29:55 +0000 (Fri, 17 Nov 2023)
Log Message:
-----------
Update launch4j to version 3.50 and also search in PATH environment variable for a Java runtime from the EXE launcher

Modified Paths:
--------------
    jEdit/trunk/build.xml
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/ivy.xml
    jEdit/trunk/package-files/windows/jedit.launch4j.xml

Modified: jEdit/trunk/build.xml
===================================================================
--- jEdit/trunk/build.xml	2023-11-17 01:34:10 UTC (rev 25699)
+++ jEdit/trunk/build.xml	2023-11-17 02:29:55 UTC (rev 25700)
@@ -562,7 +562,7 @@
 				<unjar src="${lib.dir}/launch4j/launch4j-workdir-win32.jar"
 				       dest="${build.dir}/launch4j"/>
 				<copy todir="${lib.dir}/launch4j">
-					<fileset dir="${build.dir}/launch4j/launch4j-3.12-workdir-win32/"/>
+					<fileset dir="${build.dir}/launch4j/launch4j-3.50-workdir-win32/"/>
 				</copy>
 			</contrib:case>
 			<contrib:case value="unix-x64">
@@ -569,7 +569,7 @@
 				<unjar src="${lib.dir}/launch4j/launch4j-workdir-linux64.jar"
 				       dest="${build.dir}/launch4j/"/>
 				<copy todir="${lib.dir}/launch4j">
-					<fileset dir="${build.dir}/launch4j/launch4j-3.12-workdir-linux64/"/>
+					<fileset dir="${build.dir}/launch4j/launch4j-3.50-workdir-linux64/"/>
 				</copy>
 				<chmod dir="${lib.dir}/launch4j/bin"
 				       perm="+x"
@@ -579,7 +579,7 @@
 				<unjar src="${lib.dir}/launch4j/launch4j-workdir-linux.jar"
 				       dest="${build.dir}/launch4j/"/>
 				<copy todir="${lib.dir}/launch4j">
-					<fileset dir="${build.dir}/launch4j/launch4j-3.12-workdir-linux/"/>
+					<fileset dir="${build.dir}/launch4j/launch4j-3.50-workdir-linux/"/>
 				</copy>
 				<chmod dir="${lib.dir}/launch4j/bin"
 				       perm="+x"
@@ -589,7 +589,7 @@
 				<unjar src="${lib.dir}/launch4j/launch4j-workdir-mac.jar"
 				       dest="${build.dir}/launch4j/"/>
 				<copy todir="${lib.dir}/launch4j">
-					<fileset dir="${build.dir}/launch4j/launch4j-3.12-workdir-mac/"/>
+					<fileset dir="${build.dir}/launch4j/launch4j-3.50-workdir-mac/"/>
 				</copy>
 				<chmod dir="${lib.dir}/launch4j/bin"
 				       perm="+x"

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2023-11-17 01:34:10 UTC (rev 25699)
+++ jEdit/trunk/doc/CHANGES.txt	2023-11-17 02:29:55 UTC (rev 25700)
@@ -32,6 +32,9 @@
 }}}
 {{{ Miscellaneous
 
+- Update launch4j to version 3.50 and also search in PATH environment
+  variable for a Java runtime from the EXE launcher (Björn Kautler)
+
 - Update macOS app bundler to version 1.2.0 (Björn Kautler)
 
 - Status bar design updated with the ability to add widgets to the left

Modified: jEdit/trunk/ivy.xml
===================================================================
--- jEdit/trunk/ivy.xml	2023-11-17 01:34:10 UTC (rev 25699)
+++ jEdit/trunk/ivy.xml	2023-11-17 02:29:55 UTC (rev 25700)
@@ -72,7 +72,7 @@
 
 		<dependency org="org.apache.xmlgraphics" name="fop" rev="2.3" conf="fop"/>
 
-		<dependency org="net.sf.launch4j" name="launch4j" rev="3.12" conf="launch4j">
+		<dependency org="net.sf.launch4j" name="launch4j" rev="3.50" conf="launch4j">
 			<artifact name="launch4j" e:classifier="core"/>
 			<artifact name="launch4j" e:classifier="workdir-win32"/>
 			<artifact name="launch4j" e:classifier="workdir-mac"/>

Modified: jEdit/trunk/package-files/windows/jedit.launch4j.xml
===================================================================
--- jEdit/trunk/package-files/windows/jedit.launch4j.xml	2023-11-17 01:34:10 UTC (rev 25699)
+++ jEdit/trunk/package-files/windows/jedit.launch4j.xml	2023-11-17 02:29:55 UTC (rev 25700)
@@ -32,10 +32,8 @@
 	<stayAlive>true</stayAlive>
 	<icon>@base.dir@/icons/jedit.ico</icon>
 	<jre>
-		<path>%JAVA_HOME%</path>
-		<bundledJreAsFallback>true</bundledJreAsFallback>
+		<path>%JAVA_HOME%;%PATH%</path>
 		<minVersion>@target.java.version@</minVersion>
-		<jdkPreference>preferJdk</jdkPreference>
 	</jre>
 	<versionInfo>
 		<fileVersion>@jedit.build.number@</fileVersion>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.