Return-Path: 
 <commits-return-47316-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 34188 invoked from network); 22 Nov 2007 15:35:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 22 Nov 2007 15:35:02 -0000
Received: (qmail 26967 invoked by uid 500); 22 Nov 2007 15:34:49 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 26953 invoked by uid 500); 22 Nov 2007 15:34: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 26944 invoked by uid 99); 22 Nov 2007 15:34:49 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Nov 2007 07:34:49 -0800
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, 22 Nov 2007 15:35:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 18FD41A9832; Thu, 22 Nov 2007 07:34:39 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r597436 -
 /harmony/enhanced/drlvm/trunk/build/make/build.xml
Date: Thu, 22 Nov 2007 15:34:38 -0000
To: commits@harmony.apache.org
From: tellison@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071122153439.18FD41A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tellison
Date: Thu Nov 22 07:34:38 2007
New Revision: 597436

URL: http://svn.apache.org/viewvc?rev=597436&view=rev
Log:
Apply patch HARMONY-5165 ([build][drlvm] Post-build relocation for Harmony)

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=597436&r1=597435&r2=597436&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Thu Nov 22 07:34:38 2007
@@ -473,7 +473,7 @@
     <!-- Main target for building components -->
     <target name="build" depends="setup, init, set.target.to.build,
                                     process.components, fill.up.deploy,
-                                    deploy.canonical" />
+                                    deploy.canonical, deploy.relocate" />
 
     <target name="set.target.to.build">
         <property name="target" value="build" />
@@ -695,6 +695,30 @@
                 <include name="*.so.*" />
             </fileset>
         </chmod>
+    </target>
+
+    <!-- ==================================================================
+        relocate build for Windows
+      ================================================================== -->
+    <target name="deploy.relocate" if="is.windows">
+        <fileset dir="${build.deploy.dir}/jdk/jre/bin/" id="relocate.files">
+            <include name="**/*.dll" />
+        </fileset>
+
+        <pathconvert pathsep=" " property="relocate.files.all" refid="relocate.files" />
+
+        <exec executable="editbin">
+            <arg value="/LARGEADDRESSAWARE" />
+            <arg value="/BIND" />
+            <arg value="${build.deploy.dir}/jdk/jre/bin/java.exe" />
+        </exec>
+
+        <exec executable="editbin">
+            <arg value="/LARGEADDRESSAWARE" />
+            <arg value="/BIND" />
+            <arg value="/rebase:base=0x500000" />
+            <arg line="${relocate.files.all}" />
+        </exec>
     </target>
 
     <target name="deploy.antlr">