(royale-compiler) branch develop updated: Make source-vs-tag verification mandatory in the approve scripts

[yishayw]

This is an automated email from the ASF dual-hosted git repository.

yishayw 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 ee29ee5ef Make source-vs-tag verification mandatory in the approve 
scripts
     new d446e126b Merge branch 'develop' of 
https://github.com/apache/royale-compiler into develop
ee29ee5ef is described below

commit ee29ee5efaf5e6b420ba79a9987802a214e7d432
Author: Yishay Weiss <yishayj...@hotmail.com>
AuthorDate: Fri Aug 7 12:16:45 2026 +0100

    Make source-vs-tag verification mandatory in the approve scripts
---
 compiler-build-tools/ApproveBuildTools.xml | 16 ++++++++++------
 compiler-jburg-types/ApproveJBurgTypes.xml | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/compiler-build-tools/ApproveBuildTools.xml 
b/compiler-build-tools/ApproveBuildTools.xml
index 7204225ec..2fa4f6d6b 100644
--- a/compiler-build-tools/ApproveBuildTools.xml
+++ b/compiler-build-tools/ApproveBuildTools.xml
@@ -612,15 +612,17 @@
     </target>
 
     <!--
-        Optional source-vs-tag verification.
+        Source-vs-tag verification.
         Confirms the source ZIP file list matches the content of the release 
tag
         in a local royale-compiler checkout, catching any spurious files that
-        do not exist in the tag. Skipped unless -Dcompiler.dir=<path to a
-        royale-compiler checkout> is provided. Can also be invoked directly:
+        do not exist in the tag. Part of the standard approval flow, so
+        -Dcompiler.dir=<path to a royale-compiler checkout> is required.
+        Can also be invoked directly:
           ant -f ApproveBuildTools.xml verify-source-matches-tag \
               -Drelease.version=x.y.z -Drc=N 
-Dcompiler.dir=/path/to/royale-compiler
     -->
-    <target name="verify-source-matches-tag" if="compiler.dir">
+    <target name="verify-source-matches-tag">
+        <fail message="This target requires -Dcompiler.dir=&lt;path to a 
royale-compiler checkout containing the release tag&gt;" unless="compiler.dir" 
/>
         <fail message="compiler.dir '${compiler.dir}' does not look like a git 
checkout (no .git directory)">
             <condition><not><available file="${compiler.dir}/.git" 
/></not></condition>
         </fail>
@@ -648,11 +650,13 @@
         <delete file="${basedir}/from-tag.tar" />
 
         <pathconvert property="tag.filelist" pathsep="${line.separator}">
-            <fileset dir="${from.tag.dir}" />
+            <!-- Excluded files are dropped from the bundle by the 
source-release assembly. -->
+            <fileset dir="${from.tag.dir}" excludes=".classpath,.project" />
             <map from="${from.tag.dir}${file.separator}" to="" />
         </pathconvert>
         <pathconvert property="src.filelist" pathsep="${line.separator}">
-            <fileset dir="${src.tree}" />
+            <!-- target/** is output from the preceding build; the rest are 
added by the source-release assembly. -->
+            <fileset dir="${src.tree}" 
excludes="target/**,DEPENDENCIES,LICENSE,NOTICE" />
             <map from="${src.tree}${file.separator}" to="" />
         </pathconvert>
 
diff --git a/compiler-jburg-types/ApproveJBurgTypes.xml 
b/compiler-jburg-types/ApproveJBurgTypes.xml
index 21bfc00a9..08976b09c 100644
--- a/compiler-jburg-types/ApproveJBurgTypes.xml
+++ b/compiler-jburg-types/ApproveJBurgTypes.xml
@@ -613,15 +613,17 @@
     </target>
 
     <!--
-        Optional source-vs-tag verification.
+        Source-vs-tag verification.
         Confirms the source ZIP file list matches the content of the release 
tag
         in a local royale-compiler checkout, catching any spurious files that
-        do not exist in the tag. Skipped unless -Dcompiler.dir=<path to a
-        royale-compiler checkout> is provided. Can also be invoked directly:
+        do not exist in the tag. Part of the standard approval flow, so
+        -Dcompiler.dir=<path to a royale-compiler checkout> is required.
+        Can also be invoked directly:
           ant -f ApproveJBurgTypes.xml verify-source-matches-tag \
               -Drelease.version=x.y.z -Drc=N 
-Dcompiler.dir=/path/to/royale-compiler
     -->
-    <target name="verify-source-matches-tag" if="compiler.dir">
+    <target name="verify-source-matches-tag">
+        <fail message="This target requires -Dcompiler.dir=&lt;path to a 
royale-compiler checkout containing the release tag&gt;" unless="compiler.dir" 
/>
         <fail message="compiler.dir '${compiler.dir}' does not look like a git 
checkout (no .git directory)">
             <condition><not><available file="${compiler.dir}/.git" 
/></not></condition>
         </fail>
@@ -649,11 +651,13 @@
         <delete file="${basedir}/from-tag.tar" />
 
         <pathconvert property="tag.filelist" pathsep="${line.separator}">
-            <fileset dir="${from.tag.dir}" />
+            <!-- Excluded files are dropped from the bundle by the 
source-release assembly. -->
+            <fileset dir="${from.tag.dir}" excludes=".classpath,.project" />
             <map from="${from.tag.dir}${file.separator}" to="" />
         </pathconvert>
         <pathconvert property="src.filelist" pathsep="${line.separator}">
-            <fileset dir="${src.tree}" />
+            <!-- target/** is output from the preceding build; the rest are 
added by the source-release assembly. -->
+            <fileset dir="${src.tree}" 
excludes="target/**,DEPENDENCIES,LICENSE,NOTICE" />
             <map from="${src.tree}${file.separator}" to="" />
         </pathconvert>