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

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

Author: romain
Date: 2009-09-21 16:53:01 +0200 (Mon, 21 Sep 2009)
New Revision: 171

Modified:
   pkg/RemoteREngine.test/configure.R
   pkg/RemoteREngine.test/inst/java_src/build.xml
Log:
minor updates

Modified: pkg/RemoteREngine.test/configure.R
===================================================================
--- pkg/RemoteREngine.test/configure.R	2009-09-21 14:50:29 UTC (rev 170)
+++ pkg/RemoteREngine.test/configure.R	2009-09-21 14:53:01 UTC (rev 171)
@@ -28,23 +28,22 @@
 	client.policy <- system.file( "policy", "client.policy", package = "RemoteREngine" ) 
 	server.policy <- system.file( "policy", "server.policy", package = "RemoteREngine" ) 
 	
-	cat( "\n\n\n# generated content below\n\n",
+	generated.properties <- paste( "\n\n\n# generated content below\n\n",
 		"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", 
-		file = "build.properties" ,	sep = "", 
+		"server.policy=", server.policy, "\n", sep = "" )
+	cat( generated.properties, file = "build.properties" ,	sep = "", 
 		append = TRUE )
+	cat( generated.properties, file = "../testng/build.properties", sep = "" )
 }			
 # }}}
 
 require( ant ) 
 
-rscript <- file.path( R.home(), "bin", "Rscript" )
 root <- getwd()
-dir.create( "inst/java" )
 setwd( "inst/java_src" )
 
 java_src.dir <- getwd()

Modified: pkg/RemoteREngine.test/inst/java_src/build.xml
===================================================================
--- pkg/RemoteREngine.test/inst/java_src/build.xml	2009-09-21 14:50:29 UTC (rev 170)
+++ pkg/RemoteREngine.test/inst/java_src/build.xml	2009-09-21 14:53:01 UTC (rev 171)
@@ -25,10 +25,6 @@
   <property file="./build.properties"/>
   <!--}}}-->
 	
-  <!--{{{ define testng tasks -->
-	<!-- <taskdef resource="testngtasks" classpath="${testng.jar}" /> -->
-	<!--}}}-->
-  
 	<!--{{{ classpath -->
 	<path id="project.classpath">
 		<pathelement location="${client.jar}" />