Return-Path: 
 <commits-return-43340-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 94047 invoked from network); 6 Sep 2007 12:05:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 6 Sep 2007 12:05:55 -0000
Received: (qmail 66706 invoked by uid 500); 6 Sep 2007 12:05:49 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 66618 invoked by uid 500); 6 Sep 2007 12:05:49 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 66609 invoked by uid 99); 6 Sep 2007 12:05:49 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2007 05:05:49 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2007 12:05:54 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A25FC1A9832; Thu,  6 Sep 2007 05:05:34 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r573237 -
 /harmony/enhanced/drlvm/trunk/build/make/build.xml
Date: Thu, 06 Sep 2007 12:05:34 -0000
To: commits@harmony.apache.org
From: varlax@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20070906120534.A25FC1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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" />