harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r941503 [5/5] - in /harmony/enhanced/java/trunk: ./ classlib/ classlib/make/ classlib/modules/accessibility/ classlib/modules/annotation/ classlib/modules/applet/ classlib/modules/archive/ classlib/modules/auth/ classlib/modules/awt/ classl...
Date Wed, 05 May 2010 21:29:20 GMT
Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/apache.gif
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/java/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
            ('svn:mergeinfo' removed)

Modified: harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml Wed May  5 21:29:16 2010
@@ -19,217 +19,126 @@
 <project name="Samsa Build" default="build" basedir=".">
     <description>Build for samsa program</description>
 
-    <!-- import common properties -->
+    <property name="hy.module" value="samsa" />
+    <property name="hy.hdk" location="../../deploy" />
     <import file="../../make/properties.xml" />
+    <import file="${hy.hdk}/build/ant/properties.xml" />
 
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-
-    <property name="tests.output" location="../../build/test_report" />
-
-    <!-- filename for tests exclude list -->
-    <property name="samsa.exclude.file" location="${hy.hdk}/build/jdktools.samsa.exclude"
/>
-
-    <target name="build" depends="build-native"/>
-    <target name="build-java"/>
-
-    <target name="clean" depends="clean-native"/>
-    <target name="clean-java"/>
-
-    <target name="test" depends="test-module" />
-    <target name="build-tests" />
-    <target name="test-module" depends="prepare-exclude, run-tests" />
-
-    <target name="build-native" depends="-compile-native, -copy-native-exe, -copy-native-exe-windows,
-copy-native-data" />
+    <target name="build" depends="build-native,-test-jar"
+            unless="skip.native.build"/>
+    <target name="clean" depends="clean-native" unless="skip.native.build"/>
+    <target name="test" depends="-test-module" />
+    <target name="-test-module" depends="run-tests" />
+
+    <target name="build-native" unless="skip.native.build"
+            depends="-compile-native,-copy-native-exe,
+                     -copy-native-exe-windows,-copy-native-data" />
 
     <!-- compile universal samsa binary -->
-    <target name="-compile-native" >
-
-        <echo message="Compiling SAMSA natives" />
-        <echo message="harmony.jdktools=${harmony.jdktools}" />
-            
+    <target name="-compile-native" unless="skip.native.build">
+        <echo message="Compiling ${hy.module} natives" />
         <make dir="src/main/native/samsa/${hy.os.family}" />
-
     </target>
 
     <!-- copy samsa executable for different tools -->
-    <target name="-copy-native-exe" >
+    <target name="-copy-native-exe" unless="skip.native.build">
 
         <property name="hy.samsa.exe"
                   location="${hy.hdk}/lib/samsa${exe.suffix}" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/java${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/java${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/java${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/java${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/javac${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/javac${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javac${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/javac${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/javah${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/javah${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javah${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/javah${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/javadoc${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/javadoc${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javadoc${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/javadoc${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/javap${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/javap${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javap${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/javap${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/jarsigner${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/jarsigner${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/jarsigner${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/jarsigner${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/appletviewer${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/appletviewer${exe.suffix}" perm="ugo+x"
/>
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/appletviewer${exe.suffix}"
/>
+        <chmod file="${hy.jdk}/bin/appletviewer${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/keytool${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/keytool${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/keytool${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/keytool${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/unpack200${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/unpack200${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/unpack200${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/unpack200${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/pack200${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/pack200${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/pack200${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/pack200${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/policytool${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/policytool${exe.suffix}" perm="ugo+x"
/>
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/policytool${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/policytool${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/jar${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/jar${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/jar${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/jar${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/rmic${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/rmic${exe.suffix}" perm="ugo+x" />
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/rmid${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/rmid${exe.suffix}" perm="ugo+x" />
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/rmiregistry${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/rmiregistry${exe.suffix}" perm="ugo+x"
/>
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/rmic${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/rmic${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/rmid${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/rmid${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/rmiregistry${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/rmiregistry${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/serialver${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/serialver${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/serialver${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/serialver${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jretools.deploy.dir}/bin/keytool${exe.suffix}"
/>
-        <chmod file="${jretools.deploy.dir}/bin/keytool${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jre}/bin/keytool${exe.suffix}" />
+        <chmod file="${hy.jre}/bin/keytool${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jretools.deploy.dir}/bin/unpack200${exe.suffix}"
/>
-        <chmod file="${jretools.deploy.dir}/bin/unpack200${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jre}/bin/unpack200${exe.suffix}" />
+        <chmod file="${hy.jre}/bin/unpack200${exe.suffix}" perm="ugo+x" />
 
-    	<copy file="${hy.samsa.exe}" tofile="${jretools.deploy.dir}/bin/pack200${exe.suffix}"
/>
-    	<chmod file="${jretools.deploy.dir}/bin/pack200${exe.suffix}" perm="ugo+x" />
+    	<copy file="${hy.samsa.exe}" tofile="${hy.jre}/bin/pack200${exe.suffix}" />
+    	<chmod file="${hy.jre}/bin/pack200${exe.suffix}" perm="ugo+x" />
 
-    	<copy file="${hy.samsa.exe}" tofile="${jretools.deploy.dir}/bin/policytool${exe.suffix}"
/>
-        <chmod file="${jretools.deploy.dir}/bin/policytool${exe.suffix}" perm="ugo+x"
/>
+    	<copy file="${hy.samsa.exe}" tofile="${hy.jre}/bin/policytool${exe.suffix}" />
+        <chmod file="${hy.jre}/bin/policytool${exe.suffix}" perm="ugo+x" />
 
     </target>
 
     <!-- copy windows javaw executable -->
-    <target name="-copy-native-exe-windows" if="is.windows" >
+    <target name="-copy-native-exe-windows" unless="skip.native.build"
+            if="is.windows">
         <property name="hy.samsaw.exe"
                   location="${hy.hdk}/lib/samsaw${exe.suffix}" />
 
         <copy file="${hy.samsaw.exe}"
-              tofile="${jdktools.deploy.dir}/bin/javaw${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/javaw${exe.suffix}"
+              tofile="${hy.jdk}/bin/javaw${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/javaw${exe.suffix}"
                perm="ugo+x" />
     </target>
 
     <!-- copy samsa configuration data for different tools -->
-    <target name="-copy-native-data" >
-
-        <copy todir="${jdktools.deploy.dir}/bin/data" overwrite="yes">
+    <target name="-copy-native-data" unless="skip.native.build">
+        <copy todir="${hy.jdk}/bin/data" overwrite="yes">
             <fileset dir="src/main/resources/data/">
                 <include name="*.dat" />
             </fileset>
         </copy>
-
     </target>
 
-    <target name="prepare-exclude">
-        <echo message="SAMSA exclude list: ${samsa.exclude.file}" />
-        <prepare-exclude-list moduleName="samsa" dir="./make"
-                             result="${samsa.exclude.file}" />
-    </target>
-
-    <target name="run-tests" depends="prepare-exclude" >
-
-        <property name="test.jre.home" value="${jdktools.deploy.dir}/jre" />
-
-        <echo message="Running SAMSA tests" />
-        <echo message="test.jre.home=${test.jre.home}" />
-
-        <echo message="Run jdk/bin/java -version in ${tests.output}"/>
-        <exec failonerror="true"
-	      executable="${test.jre.home}/../bin/java${exe.suffix}"
-	      dir="${tests.output}"
-              outputproperty="java.out.text">
-	    <arg line="-version" />
-        </exec>
-        <fail message="java -version should contain a copyright statement">
-            <condition>
-                <not>
-                    <contains string="${java.out.text}"
-                              substring="Copyright 1991"/>
-                </not>
-            </condition>
-        </fail>
-        <fail message="java -version should contain svn revision information">
-            <condition>
-                <not>
-                    <contains string="${java.out.text}" substring="svn = r"/>
-                </not>
-            </condition>
-        </fail>
-
-        <echo message="Run jdk/bin/javac -version in ${tests.output}"/>
-        <exec failonerror="true"
-	        executable="${test.jre.home}/../bin/javac${exe.suffix}"
-	        dir="${tests.output}">
-	    <arg line="-version" />
-        </exec>
-
-        <echo message="Run jdk/bin/javah in ${tests.output}"/>
-        <exec failonerror="false"
-	        executable="${test.jre.home}/../bin/javah${exe.suffix}"
-	        dir="${tests.output}">
-	    <arg line="" />
-        </exec>
-
-        <echo message="Run jdk/bin/javadoc in ${tests.output}"/>
-        <exec failonerror="false"
-	        executable="${test.jre.home}/../bin/javadoc${exe.suffix}"
-	        dir="${tests.output}">
-	    <arg line="" />
-        </exec>
-
-        <echo message="Run jdk/bin/jarsigner in ${tests.output}"/>
-        <exec failonerror="false"
-	        executable="${test.jre.home}/../bin/jarsigner${exe.suffix}"
-	        dir="${tests.output}">
-	    <arg line="" />
-        </exec>
-
-        <echo message="Run jdk/jre/bin/keytool -help in ${tests.output}"/>
-        <exec failonerror="true"
-	        executable="${test.jre.home}/bin/keytool${exe.suffix}"
-	        dir="${tests.output}">
-	    <arg line="-help" />
-        </exec>
-
-        <echo message="Run jdk/jre/bin/unpack200 in ${tests.output}"/>
-        <exec failonerror="true"
-	        executable="${test.jre.home}/bin/unpack200${exe.suffix}"
-	        dir="${tests.output}">
-	    <arg line="" />
-        </exec>
-
-        <echo message="Run jdk/jre/bin/pack200 in ${tests.output}"/>
-        <exec failonerror="true"
-	        executable="${test.jre.home}/bin/pack200${exe.suffix}"
-	        dir="${tests.output}">
-	    <arg line="" />
-        </exec>
-
+    <target name="-test-jar" unless="skip.test.build">
+        <mkdir dir="${tests.hdk.dir}" />
+        <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
+    </target>
 
+    <target name="run-tests" depends="-test-jar">
+        <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
     <!-- Clean natives -->
-    <target name="clean-native">
-        <echo message="Cleaning SAMSA natives" />
+    <target name="clean-native" unless="skip.native.build">
+        <echo message="Cleaning ${hy.module} natives" />
         <make dir="src/main/native/samsa/${hy.os.family}"
               target="clean" />
     </target>



Mime
View raw message