On 20/05/2010 23:24, Mark Hindess wrote:
I've spotted another problem (that has existed forever). The jre tools
in hdk/jdk/jre/bin are not executable. They are broken because the
tar/zip tasks don't have the correct filesets to set their permissions.
The samsa tests check but, this until this release, they only ran on the
hdk in the target/hdk directory where the permissions are correct. In
this release, I added the samsa tests to the hdk so they are included
in the hdk tar/zip as well. When you extract the hdk and run the tests,
then the problem becomes apparent.
I'd like permission from another committer to apply the appended patch?
+1 to applying this patch - these tools should work straight out of the hdk.
Regards,
Oliver
Regards,
Mark.
Index: build.xml
===================================================================
--- build.xml (revision 945600)
+++ build.xml (working copy)
@@ -183,12 +183,20 @@
prefix="${archive.dir.prefix}hdk-${harmony.version}"
mode="755">
<include name="jdk/jre/bin/java"/>
+<include name="jdk/jre/bin/keytool"/>
+<include name="jdk/jre/bin/pack200"/>
+<include name="jdk/jre/bin/policytool"/>
+<include name="jdk/jre/bin/unpack200"/>
<include name="jdk/bin/*"/>
</tarfileset>
<tarfileset dir="${target.dir}/hdk"
prefix="${archive.dir.prefix}hdk-${harmony.version}">
<include name="**"/>
<exclude name="jdk/jre/bin/java"/>
+<exclude name="jdk/jre/bin/keytool"/>
+<exclude name="jdk/jre/bin/pack200"/>
+<exclude name="jdk/jre/bin/policytool"/>
+<exclude name="jdk/jre/bin/unpack200"/>
<exclude name="jdk/bin/*"/>
<exclude name="jdk/jre/README"/>
</tarfileset>
@@ -212,6 +220,10 @@
filemode="755">
<include name="jdk/jre/bin/java.exe"/>
<include name="jdk/jre/bin/javaw.exe"/>
+<include name="jdk/jre/bin/keytool.exe"/>
+<include name="jdk/jre/bin/pack200.exe"/>
+<include name="jdk/jre/bin/policytool.exe"/>
+<include name="jdk/jre/bin/unpack200.exe"/>
<include name="jdk/bin/*"/>
</zipfileset>
<zipfileset dir="${target.dir}/hdk"
@@ -219,6 +231,10 @@
<include name="**"/>
<exclude name="jdk/jre/bin/java.exe"/>
<exclude name="jdk/jre/bin/javaw.exe"/>
+<exclude name="jdk/jre/bin/keytool.exe"/>
+<exclude name="jdk/jre/bin/pack200.exe"/>
+<exclude name="jdk/jre/bin/policytool.exe"/>
+<exclude name="jdk/jre/bin/unpack200.exe"/>
<exclude name="jdk/bin/*"/>
<exclude name="jdk/jre/README"/>
</zipfileset>
@@ -247,12 +263,20 @@
prefix="${archive.dir.prefix}jdk-${harmony.version}"
mode="755">
<include name="jre/bin/java"/>
+<include name="jre/bin/keytool"/>
+<include name="jre/bin/pack200"/>
+<include name="jre/bin/policytool"/>
+<include name="jre/bin/unpack200"/>
<include name="bin/*"/>
</tarfileset>
<tarfileset dir="${target.dir}/hdk/jdk"
prefix="${archive.dir.prefix}jdk-${harmony.version}">
<include name="**"/>
<exclude name="jre/bin/java"/>
+<exclude name="jre/bin/keytool"/>
+<exclude name="jre/bin/pack200"/>
+<exclude name="jre/bin/policytool"/>
+<exclude name="jre/bin/unpack200"/>
<exclude name="bin/*"/>
<exclude name="jre/README"/>
</tarfileset>
@@ -274,6 +298,10 @@
filemode="755">
<include name="jre/bin/java.exe"/>
<include name="jre/bin/javaw.exe"/>
+<include name="jre/bin/keytool.exe"/>
+<include name="jre/bin/pack200.exe"/>
+<include name="jre/bin/policytool.exe"/>
+<include name="jre/bin/unpack200.exe"/>
<include name="bin/*"/>
</zipfileset>
<zipfileset dir="${target.dir}/hdk/jdk"
@@ -281,6 +309,10 @@
<include name="**"/>
<exclude name="jre/bin/java.exe"/>
<exclude name="jre/bin/javaw.exe"/>
+<exclude name="jre/bin/keytool.exe"/>
+<exclude name="jre/bin/pack200.exe"/>
+<exclude name="jre/bin/policytool.exe"/>
+<exclude name="jre/bin/unpack200.exe"/>
<exclude name="bin/*"/>
<exclude name="jre/README"/>
</zipfileset>
@@ -309,11 +341,19 @@
prefix="${archive.dir.prefix}jre-${harmony.version}"
mode="755">
<include name="bin/java"/>
+<include name="bin/keytool"/>
+<include name="bin/pack200"/>
+<include name="bin/policytool"/>
+<include name="bin/unpack200"/>
</tarfileset>
<tarfileset dir="${target.dir}/hdk/jdk/jre"
prefix="${archive.dir.prefix}jre-${harmony.version}">
<include name="**"/>
<exclude name="bin/java"/>
+<exclude name="bin/keytool"/>
+<exclude name="bin/pack200"/>
+<exclude name="bin/policytool"/>
+<exclude name="bin/unpack200"/>
</tarfileset>
</tar>
@@ -329,12 +369,20 @@
filemode="755">
<include name="bin/java.exe"/>
<include name="bin/javaw.exe"/>
+<include name="bin/keytool.exe"/>
+<include name="bin/pack200.exe"/>
+<include name="bin/policytool.exe"/>
+<include name="bin/unpack200.exe"/>
</zipfileset>
<zipfileset dir="${target.dir}/hdk/jdk/jre"
prefix="${archive.dir.prefix}jre-${harmony.version}">
<include name="**"/>
<exclude name="bin/java.exe"/>
<exclude name="bin/javaw.exe"/>
+<exclude name="bin/keytool.exe"/>
+<exclude name="bin/pack200.exe"/>
+<exclude name="bin/policytool.exe"/>
+<exclude name="bin/unpack200.exe"/>
</zipfileset>
</zip>
<chksum dir="${target.dir}" file="${deploy.jre.zip}" />
--
Oliver Deakin
Unless stated otherwise above:
IBM United Kingdom Limited - Registered in England and Wales with number 741598.
Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU
