[Remoterengine-commits] r150 - in pkg/RemoteREngine.test/inst: java_src testng

[noreply at r-forge.r-project.org]

Author: romain
Date: 2009-09-17 16:21:47 +0200 (Thu, 17 Sep 2009)
New Revision: 150

Modified:
   pkg/RemoteREngine.test/inst/java_src/build.xml
   pkg/RemoteREngine.test/inst/testng/build.xml
Log:
generate standalone zip file for testing without using R

Modified: pkg/RemoteREngine.test/inst/java_src/build.xml
===================================================================
--- pkg/RemoteREngine.test/inst/java_src/build.xml	2009-09-17 13:09:19 UTC (rev 149)
+++ pkg/RemoteREngine.test/inst/java_src/build.xml	2009-09-17 14:21:47 UTC (rev 150)
@@ -6,10 +6,18 @@
 	<taskdef resource="testngtasks" classpath="${jdk15.testing.jar}" />
   
 	<r-set property="client.jar">
-		system.file( "java", "RemoteREngine-client.jar", 
-			package = "RemoteREngine" )
+		system.file( "java", "RemoteREngine-client.jar", package = "RemoteREngine" )
 	</r-set>
+	
+	<r-set property="client.policy">
+	  system.file( "policy", "client.policy", package = "RemoteREngine" )
+	</r-set>
 
+	<r-set property="server.policy">
+	  system.file( "policy", "server.policy", package = "RemoteREngine" )
+	</r-set>
+
+
 	<path id="project.classpath">
 		<pathelement location="${client.jar}" />
 		<pathelement location="${jdk15.testing.jar}" />
@@ -42,7 +50,28 @@
 		</jar>
 	</target>
 	
-	<target name="all" depends="compile,build" />
+	<target name="testng-standalone">
+		<property name="dir.lib" value="../testng-standalone/lib" />
+		<property name="dir.policy" value="../testng-standalone/policy" />
+		
+		<mkdir dir="${dir.lib}" />
+		<copy file="${inst.dir}/RemoteREngine-test.jar" todir="${dir.lib}" />
+		<copy file="${jdk15.testing.jar}" todir="${dir.lib}" />
+		<copy file="${client.jar}" todir="${dir.lib}" />
+		
+		<mkdir dir="${dir.policy}" />
+		<copy file="${client.policy}" todir="${dir.policy}" />
+		<copy file="${server.policy}" todir="${dir.policy}" />
+		
+		<copy file="../testng/testng.xml" todir="../testng-standalone" />
+		
+		<zip destfile="../testng.zip" basedir="../testng-standalone" />
+		<delete dir="../testng-standalone" />
+		
+	</target>
 	
+	
+	<target name="all" depends="compile,build,testng-standalone" />
+	
 </project>
 

Modified: pkg/RemoteREngine.test/inst/testng/build.xml
===================================================================
--- pkg/RemoteREngine.test/inst/testng/build.xml	2009-09-17 13:09:19 UTC (rev 149)
+++ pkg/RemoteREngine.test/inst/testng/build.xml	2009-09-17 14:21:47 UTC (rev 150)
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <project name="RemoteREngine.runtests">
 
+	<!-- TODO: move these into property file generated by main build -->
+	<property file="./build.properties" /> 
 	<r-set property="testng.jar">
 		system.file( "java_src", "lib", "testng-5.10-jdk15.jar", package = "RemoteREngine.test" )
 	</r-set>
@@ -22,7 +24,7 @@
 	</r-set>
 
 	<r-set property="server.policy">
-	  system.file( "policy", "client.policy", package = "RemoteREngine" )
+	  system.file( "policy", "server.policy", package = "RemoteREngine" )
 	</r-set>
 	
 	<property name="testng.reports" value="reports" />