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

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

Author: romain
Date: 2009-09-17 12:44:49 +0200 (Thu, 17 Sep 2009)
New Revision: 142

Modified:
   pkg/RemoteREngine.test/inst/java_src/build.properties
   pkg/RemoteREngine.test/inst/java_src/build.xml
   pkg/RemoteREngine/inst/java_src/build.xml
Log:
small updates to build

Modified: pkg/RemoteREngine/inst/java_src/build.xml
===================================================================
--- pkg/RemoteREngine/inst/java_src/build.xml	2009-09-17 09:31:02 UTC (rev 141)
+++ pkg/RemoteREngine/inst/java_src/build.xml	2009-09-17 10:44:49 UTC (rev 142)
@@ -23,9 +23,8 @@
 
 	<!--{{{ Properties -->
   <property file="./build.properties"/>
-	<!--}}}-->
-    
-	<!--{{{ clean -->
+  
+  <!--{{{ clean -->
 	<target name="clean">
 		<delete dir="build" />
 		<delete dir="jars" />
@@ -68,8 +67,20 @@
 		</javac>	
 		
 	</target>
+	
+	<path id="javadoc_classpath">
+		<pathelement location="${common.dir}" />
+		<pathelement location="${client.dir}" />
+		<pathelement location="${server.dir}" />
+		<pathelement location="${rengine.jar}" />
+		<pathelement location="${jriengine.jar}" />
+		<pathelement location="${jri.jar}" />
+	</path>
+	
+	
 	<target name="javadoc"
 		description="Compile the Javadoc API documentation to dist dir">
+			
 		<javadoc
 		           destdir="${javadoc.dir}"
 		           author="true"

Modified: pkg/RemoteREngine.test/inst/java_src/build.properties
===================================================================
--- pkg/RemoteREngine.test/inst/java_src/build.properties	2009-09-17 09:31:02 UTC (rev 141)
+++ pkg/RemoteREngine.test/inst/java_src/build.properties	2009-09-17 10:44:49 UTC (rev 142)
@@ -10,11 +10,9 @@
 build.dir=build
 inst.dir=../java
 
-testng.jar=lib/testng-5.10-jdk15.jar
-
 # testng.home=D:\JavaLibraries\testng-5.10
 testng.build=build/test
 testng.reports=build/testng_reports
 
-jdk15.testing.jar=locallib/testng-5.10-jdk15.jar
+jdk15.testing.jar=lib/testng-5.10-jdk15.jar
 

Modified: pkg/RemoteREngine.test/inst/java_src/build.xml
===================================================================
--- pkg/RemoteREngine.test/inst/java_src/build.xml	2009-09-17 09:31:02 UTC (rev 141)
+++ pkg/RemoteREngine.test/inst/java_src/build.xml	2009-09-17 10:44:49 UTC (rev 142)
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
-<project default="all">
+<project default="all" name="RemoteREngine.test">
 
 	<property file="build.properties"/>
+	
 	<taskdef resource="testngtasks" classpath="${jdk15.testing.jar}" />
   
 	<r-set property="client.jar">
@@ -11,7 +12,7 @@
 
 	<path id="project.classpath">
 		<pathelement location="${client.jar}" />
-		<pathelement location="${testng.jar}" />
+		<pathelement location="${jdk15.testing.jar}" />
 	</path>
 	
 	<target name="compile">
@@ -41,33 +42,7 @@
 		</jar>
 	</target>
 	
-	<path id="compiletests.classpath">
-		<pathelement location="${jdk15.testing.jar}" />
-		<pathelement location="${common.dir}" />
-		<pathelement location="lib/REngine.jar" />
-	</path>
-	
-	<target name="testng-compile" depends="client,annotation,stubs">
-		<javac
-			destdir="${testng.build}"  
-			includeJavaRuntime="yes"
-			debug="${compiler.debug}"
-  			debuglevel="${compiler.debuglevel}"
-  			optimize="${compiler.optimize}"
-  			deprecation="${compiler.deprecation}"
-  			verbose="${compiler.verbose}"
-  			nowarn="${compiler.nowarn}"
-  			target="${compiler.target}"
-  			source="${compiler.source}">
-  
-			<src path="test" />
-			<src path="src/client" />
-			<include name="**/*.java"/>
-			<exclude name="**/test/*"/>
-			<classpath refid="compiletests.classpath" />
-		</javac>
-	</target>
-
+	<!--
 	<path id="testng.classpath">
 		<dirset dir="${build.dir}">
 			<include name="*" />
@@ -75,9 +50,9 @@
 		</dirset>
 		<pathelement location="lib/REngine.jar" />
 	</path>
+	
 	<target name="setup.rmicodebase" description="Build codebase for TestNG tests to use class files" >
-		<!-- Convert the classpath into a URL based path -->
-	    <pathconvert targetos="unix" property="rmicodebase" refid="testng.classpath" >
+		  <pathconvert targetos="unix" property="rmicodebase" refid="testng.classpath" >
 			<map from="C:" to="file:/c:" />
 	    	<map from="D:" to="file:/d:" />
 			<map from="E:" to="file:/e:" />
@@ -85,7 +60,6 @@
 			<map from="G:" to="file:/g:" />
 	    </pathconvert>
 	</target>
-	<!-- TODO Create a target to start the test server -->
 	<target name="runtests" depends="testng-compile,setup.rmicodebase" description="Run TestNG Unit Tests">
 		<testng 
 			classpathref="testng.classpath"	
@@ -97,9 +71,9 @@
 			<classfileset dir="${testng.build}" includes="**/*.class" />
 		</testng>
 	</target>
+	-->
 	
 	
-	
 	<target name="all" depends="compile,build" />
 	
 </project>