You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ge...@apache.org on 2006/12/06 06:21:07 UTC
svn commit: r482904 - /harmony/enhanced/trunk/build.xml
Author: geirm
Date: Tue Dec 5 21:21:06 2006
New Revision: 482904
URL: http://svn.apache.org/viewvc?view=rev&rev=482904
Log:
improvements for filling out the JDK stuff
Modified:
harmony/enhanced/trunk/build.xml
Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?view=diff&rev=482904&r1=482903&r2=482904
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Tue Dec 5 21:21:06 2006
@@ -57,7 +57,7 @@
switch_svn_commonresources,
build_classlib,
build_vm,
- assemble_artifacts,
+ assemble_artifacts,
bundle_hdk,
bundle_jre"/>
@@ -71,7 +71,7 @@
<!-- ================================================================================ -->
<!-- creates the HDK bundle appropriate for the platform -->
<!-- ================================================================================ -->
- <target name="bundle_hdk" depends="assemble_hdk_doc,bundle_hdk_tgz,bundle_hdk_zip"/>
+ <target name="bundle_hdk" depends="assemble_artifacts, assemble_hdk_doc,bundle_hdk_tgz,bundle_hdk_zip"/>
<target name="bundle_hdk_tgz" depends="init" if="is.unix">
@@ -166,8 +166,9 @@
<!-- ================================================================================ -->
<!-- from the classlib and vm builds, creates the hdk and jre -->
<!-- ================================================================================ -->
- <target name="assemble_artifacts">
+ <target name="assemble_artifacts" depends="init, assemble_stuff, chmod_stuff"/>
+ <target name="assemble_stuff">
<!-- create the top-level hdk directory -->
<mkdir dir="${target.dir}/hdk"/>
@@ -177,18 +178,29 @@
<copy todir="${target.dir}/hdk">
<fileset dir="working_classlib/deploy">
<exclude name="**/jre/**/*" />
+ <exclude name="**/jdk/lib/*" />
</fileset>
</copy>
- <!-- now copy the drlvm/build/deploy/jre
- contents into the jre in the HDK -->
+ <!-- now copy the drlvm/build/deploy/jre -->
<copy todir="${target.dir}/hdk/jdk/jre">
<fileset dir="working_vm/build/deploy/jdk/jre">
<exclude name="**/*.pdb"/>
</fileset>
</copy>
+ <!-- now copy the working_jdktools/deploy/jdk -->
+ <copy todir="${target.dir}/hdk/jdk/">
+ <fileset dir="working_jdktools/deploy/jdk">
+ <exclude name="**/*.pdb"/>
+ </fileset>
+ </copy>
</target>
+
+ <target name="chmod_stuff" if="is.unix">
+ <chmod file="${target.dir}/hdk/jdk/bin/*" perm="ugo+x" />
+ <chmod file="${target.dir}/hdk/jdk/jre/bin/java*" perm="ugo+x" />
+ </target>
<target name="assemble_jdk">