harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
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 GMT
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">
 



Mime
View raw message