This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 3c1d1f000b ApproveRoyale.xml: fix examine-jars to work on all
platforms (not macOS only)
3c1d1f000b is described below
commit 3c1d1f000ba42881aa3f301f785f68d83c9e8f83
Author: Josh Tynjala <[email protected]>
AuthorDate: Thu Apr 23 10:46:09 2026 -0700
ApproveRoyale.xml: fix examine-jars to work on all platforms (not macOS
only)
---
ApproveRoyale.xml | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/ApproveRoyale.xml b/ApproveRoyale.xml
index 879b057f11..a00df711ee 100644
--- a/ApproveRoyale.xml
+++ b/ApproveRoyale.xml
@@ -962,8 +962,7 @@
</target>
-->
- <!-- how to do tar and sort on Windows? -->
- <target name="examine-jars" if="isMac">
+ <target name="examine-jars">
<!-- comma delimited list, no spaces, not one file per line -->
<copy file="jars.txt" tofile="loop.txt" />
<ant antfile="ApproveRoyale.xml" target="loopOnce" inheritAll="false"
/>
@@ -997,19 +996,21 @@
<delete file="loop1.txt" />
</target>
- <target name="jar-check" >
+ <target name="jar-check">
<delete dir="${basedir}/jar" failonerror="false" />
<mkdir dir="${basedir}/jar" />
<unjar
src="${basedir}/${bin.package.url.name}/royale-asjs/${thisFile}"
dest="${basedir}/jar" />
- <exec executable="tar" output="${basedir}/jarclasses.txt">
+ <exec executable="${java.home}/bin/jar"
output="${basedir}/jarclasses.txt">
<arg value="tf" />
<arg
value="${basedir}/${bin.package.url.name}//royale-asjs/${thisFile}" />
</exec>
<replaceregexp file="${basedir}/jarclasses.txt" match="(.*)/(.*)"
replace="\1" flags="m" byline="true"/>
- <exec executable="sort" output="${basedir}/jarpaths.txt">
- <arg value="-u" />
- <arg value="${basedir}/jarclasses.txt" />
- </exec>
+ <copy file="${basedir}/jarclasses.txt"
tofile="${basedir}/jarpaths.txt">
+ <filterchain>
+ <sortfilter/>
+ <uniqfilter/>
+ </filterchain>
+ </copy>
<antcall target="display-text" >
<param name="file" value="${basedir}/jarpaths.txt" />
</antcall>
