On 15/10/2025 14:52, Christopher Schultz wrote:
All,
ASF Trusted Release is complaining that the ZIP file for Windows x86 has
a root directory that doesn't match the filename:
"
Root directory mismatch. Expected 'apache-tomcat-10.1.47-windows-x86',
found 'apache-tomcat-10.1.47'
"
<snip/>
Do we care? If someone were to unzip both of the files into the same
output directory, the last one would win, meaning that e.g. the x86
binaries would overwrite the x64 binaries. None of the other files
really matter, as they are all cross-platform.
I think we should leave this as it is currently. Changing this is more
likely to break stuff.
ATR needs to adjust its expectations.
Mark
I have a slight preference towards adjusting our build to match RAT
expectations. So something like this:
diff --git a/build.xml b/build.xml
index 62e4cb815c..ee00261e9b 100644
--- a/build.xml
+++ b/build.xml
@@ -3082,8 +3082,8 @@ Configured for ${release.asfusername} to release
Tomcat ${version.major}.${versi
<zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-
windows-x64.zip"
modificationtime="${tstamp.iso.release}"
encoding="UTF8">
- <zipfileset file="${tomcat.dist}" fullpath="${final.name}"/>
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
+ <zipfileset file="${tomcat.dist}" fullpath="${final.name}-
windows-x64"/>
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-windows-x64">
<include name="bin/**"/>
<include name="conf/**"/>
<include name="logs/**"/>
... and the same for x86 which isn't in main so I don't have a diff for
it at the moment.
-chris
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
