changeset 1101:f857c30ba561

Fixed target override in javafx-ui-common build.xml and build-closed.xml
author Martin Sladecek <martin.sladecek@oracle.com>
date Tue, 22 May 2012 14:16:07 +0200
parents 8277e5289ea3
children 908b36f4a14e 1e79d020fce6
files javafx-ui-common/build-closed.xml javafx-ui-common/build.xml
diffstat 2 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/build-closed.xml	Mon May 21 13:22:11 2012 +0200
+++ b/javafx-ui-common/build-closed.xml	Tue May 22 14:16:07 2012 +0200
@@ -22,16 +22,7 @@
     <import file="../build-defs.xml"/>
     <import file="build-common.xml"/>
 
-    <target name="test" depends="init,jar">
-      <!-- create a META-INF directory and copy over the fonts.mf file from
-         the unit test workspace. This is necessary so that the
-         FontManagerTest unit test can check that the embedded font logic
-         works -->
-      <mkdir dir="${build.test.classes.dir}/META-INF" />
-      <copy todir="${build.test.classes.dir}/META-INF"
-            file="test/unit/com/sun/javafx/scene/text/fonts.mf" />
-      <unzip src="${jfx.amble-fonts.jar}" dest="${build.test.classes.dir}" />
-      <test-project />
-  </target>
+    <target name="test" depends="javafx-ui-common-common.test"/>
+    <target name="-pre-coverage" depends="javafx-ui-common-common.-pre-coverage"/>
 
 </project>
--- a/javafx-ui-common/build.xml	Mon May 21 13:22:11 2012 +0200
+++ b/javafx-ui-common/build.xml	Tue May 22 14:16:07 2012 +0200
@@ -4,4 +4,7 @@
 
     <import file="../build-defs.xml"/>
     <import file="build-common.xml"/>
+
+    <target name="test" depends="javafx-ui-common-common.test"/>
+    <target name="-pre-coverage" depends="javafx-ui-common-common.-pre-coverage"/>
 </project>