harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r573237 - /harmony/enhanced/drlvm/trunk/build/make/build.xml
Date Thu, 06 Sep 2007 12:05:34 GMT
Author: varlax
Date: Thu Sep  6 05:05:33 2007
New Revision: 573237

URL: http://svn.apache.org/viewvc?rev=573237&view=rev
Log:
HDK should contain both lib and include for snapshot testing

Modified:
    harmony/enhanced/drlvm/trunk/build/make/build.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?rev=573237&r1=573236&r2=573237&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Thu Sep  6 05:05:33 2007
@@ -514,7 +514,7 @@
                                            deploy.copy_classlib,
                                            deploy.antlr,
                                            deploy.vmmagic,
-                                           deploy-hdklibs">
+                                           deploy-hdk-stuff">
         
         <!-- copy our hythr for the launcher to use -->
         
@@ -539,16 +539,22 @@
         
     </target>
 
-    <target name="deploy-hdklibs">
+    <target name="deploy-hdk-stuff">
         <mkdir dir="${build.deploy.dir}/lib" />
         <copy todir="${build.deploy.dir}/lib">
-            <fileset dir="${build.semi.dir}/vm">
+            <fileset dir="${build.semi.dir}">
                 <include name="**/*.lib"/>
                 <include name="**/*.exp"/>
             </fileset>
             <flattenmapper/>
         </copy>
-
+        <mkdir dir="${build.deploy.dir}/include" />
+        <copy todir="${build.deploy.dir}/include">
+            <fileset dir="${build.semi.dir}">
+                <include name="**/apr/include/**/*.h"/>
+            </fileset>
+            <regexpmapper from="^(.*)/([^/]+)/include/(.*)" to="\3" handledirsep="yes"/>
+        </copy>
     </target>
 
     <!-- ==================================================================
@@ -563,6 +569,7 @@
         <mkdir dir="${canonical.deploy.dir}/jdk/bin" />
         <mkdir dir="${canonical.deploy.dir}/jdk/include" />
         <mkdir dir="${canonical.deploy.dir}/lib" />
+        <mkdir dir="${canonical.deploy.dir}/include" />
 
         <copy todir="${canonical.deploy.dir}/jdk/jre">
             <fileset dir="${build.deploy.dir}/jdk/jre"/>
@@ -576,6 +583,10 @@
             <fileset dir="${build.deploy.dir}/lib"/>
         </copy>
         
+        <copy todir="${canonical.deploy.dir}/include">
+            <fileset dir="${build.deploy.dir}/include"/>
+        </copy>
+
         <chmod perm="755">
             <fileset dir="${canonical.deploy.dir}/jdk/jre/bin">
                 <include name="java" />



Mime
View raw message