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

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

Author: romain
Date: 2009-09-21 17:05:13 +0200 (Mon, 21 Sep 2009)
New Revision: 173

Modified:
   pkg/RemoteREngine.test/configure.R
   pkg/RemoteREngine.test/inst/java_src/build.xml
Log:
using generated.properties

Modified: pkg/RemoteREngine.test/configure.R
===================================================================
--- pkg/RemoteREngine.test/configure.R	2009-09-21 14:53:56 UTC (rev 172)
+++ pkg/RemoteREngine.test/configure.R	2009-09-21 15:05:13 UTC (rev 173)
@@ -28,16 +28,15 @@
 	client.policy <- system.file( "policy", "client.policy", package = "RemoteREngine" ) 
 	server.policy <- system.file( "policy", "server.policy", package = "RemoteREngine" ) 
 	
-	generated.properties <- paste( "\n\n\n# generated content below\n\n",
+	generated.properties <- paste( 
 		"testng.jar=", testng.jar, "\n", 
 		"client.jar=", client.jar, "\n", 
 		"testcases.jar=", testcases.jar, "\n", 
 		"rmicodebase=", rmicodebase, "\n", 
 		"client.policy=", client.policy, "\n" ,
 		"server.policy=", server.policy, "\n", sep = "" )
-	cat( generated.properties, file = "build.properties" ,	sep = "", 
+	cat( generated.properties, file = "generated.properties" ,	sep = "", 
 		append = TRUE )
-	cat( generated.properties, file = "../testng/build.properties", sep = "" )
 }			
 # }}}
 

Modified: pkg/RemoteREngine.test/inst/java_src/build.xml
===================================================================
--- pkg/RemoteREngine.test/inst/java_src/build.xml	2009-09-21 14:53:56 UTC (rev 172)
+++ pkg/RemoteREngine.test/inst/java_src/build.xml	2009-09-21 15:05:13 UTC (rev 173)
@@ -23,6 +23,7 @@
 
 	<!--{{{ properties -  this file is generated by configure.R --> 
   <property file="./build.properties"/>
+  <property file="./generated.properties"/>
   <!--}}}-->
 	
 	<!--{{{ classpath -->
@@ -86,8 +87,14 @@
 	</target>
 	<!--}}}-->
 		
+	<!--{{{ copy generated properties to testng directory -->
+	<target name="copy-properties">
+		<copy file="./generated.properties" tofile="../testng/build.properties" />
+	</target>
+	<!--}}}-->
+	
 	<!--{{{ all target -->
- 	<target name="all" depends="compile,build,testng-standalone" />
+ 	<target name="all" depends="compile,build,copy-properties,testng-standalone" />
 	<!--}}}-->
 	
 </project>