Return-Path: 
 <commits-return-47343-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 39854 invoked from network); 23 Nov 2007 06:07:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 23 Nov 2007 06:07:48 -0000
Received: (qmail 7612 invoked by uid 500); 23 Nov 2007 06:07:35 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 7593 invoked by uid 500); 23 Nov 2007 06:07:35 -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 7584 invoked by uid 99); 23 Nov 2007 06:07:35 -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 22:07:35 -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; Fri, 23 Nov 2007 06:07:46 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 32FC11A9832; Thu, 22 Nov 2007 22:07:25 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r597565 -
 /harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/build/build-native.xml
Date: Fri, 23 Nov 2007 06:07:24 -0000
To: commits@harmony.apache.org
From: smishura@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071123060725.32FC11A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: smishura
Date: Thu Nov 22 22:07:23 2007
New Revision: 597565

URL: http://svn.apache.org/viewvc?rev=597565&view=rev
Log:
Apply patch from HARMONY-5160:
[buildtest][vtsvm] All JVMTI tests fail as manifests are not embedded in agent libraries

Modified:
    harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/build/build-native.xml

Modified: harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/build/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/build/build-native.xml?rev=597565&r1=597564&r2=597565&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/build/build-native.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/build/build-native.xml Thu Nov 22 22:07:23 2007
@@ -212,8 +212,24 @@
 			<compilerarg value="${add.option}"/>
 
 		</cc>
+        <echo message="${tmp.dir}/${file.cpp}${ext}" />
 
-	</target>
+        <condition property="embed.manifest">
+            <available file="${tmp.dir}/${file.cpp}${ext}.manifest" />
+        </condition>
+
+        <antcall target="-include.manifest" />
+    </target>
+
+    <target name="-include.manifest" if="embed.manifest">
+        <echo message="Manifesting ${tmp.dir}/${file.cpp}${ext}" />
+        <exec executable="mt.exe">
+            <arg value="-nologo" />
+            <arg value="-manifest" />
+            <arg value="${tmp.dir}/${file.cpp}${ext}.manifest" />
+            <arg value="-outputresource:${tmp.dir}/${file.cpp}${ext};#2" />
+        </exec>
+    </target>
 
 	<target name="-mk.jvmti" depends="win.init,lnx.init" description="Compiling native parts for jvmti test">