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-compiler.git
The following commit(s) were added to refs/heads/develop by this push:
new 20abe9bc6 ApproveBuildTools.xml: fix examine-jars to work on all
platforms (not macOS only)
20abe9bc6 is described below
commit 20abe9bc658b4e4dd00327f93180744afb233043
Author: Josh Tynjala <[email protected]>
AuthorDate: Thu Apr 23 10:35:26 2026 -0700
ApproveBuildTools.xml: fix examine-jars to work on all platforms (not macOS
only)
---
compiler-build-tools/ApproveBuildTools.xml | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/compiler-build-tools/ApproveBuildTools.xml
b/compiler-build-tools/ApproveBuildTools.xml
index 706861943..05c899f31 100644
--- a/compiler-build-tools/ApproveBuildTools.xml
+++ b/compiler-build-tools/ApproveBuildTools.xml
@@ -380,11 +380,7 @@
</rat:report>
</target>
- <!-- someday figure out how to use
- find . -name "*.jar" -exec tar ft {} \; | sort -u > paths.txt -->
-
- <!-- 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="ApproveBuildTools.xml" target="loopOnce"
inheritAll="false" />
@@ -418,19 +414,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}/${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}/${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>
