[Rmesquite-commits] r22 - in pkg: . src/java

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

Author: hlapp
Date: 2009-12-22 01:10:49 +0100 (Tue, 22 Dec 2009)
New Revision: 22

Modified:
   pkg/build.xml
   pkg/src/java/build.xml
Log:
Fixed Java build scripts to be both executable independently.


Modified: pkg/build.xml
===================================================================
--- pkg/build.xml	2009-12-20 05:54:23 UTC (rev 21)
+++ pkg/build.xml	2009-12-22 00:10:49 UTC (rev 22)
@@ -30,12 +30,12 @@
   
   <target name="redeploy" 
           description="rebuild the java library and copy to inst/java">
-    <ant antfile="${java.dir}/build.xml" target="redeploy"/>
+    <ant antfile="${java.dir}/build.xml" dir="${java.dir}" target="redeploy"/>
   </target>
 
   <target name="clean" 
           description="remove classes and build directories before packaging">
-    <ant antfile="${java.dir}/build.xml" target="clean"/>
+    <ant antfile="${java.dir}/build.xml" dir="${java.dir}" target="clean"/>
   </target>
 
   <target name="build" depends="redeploy,clean" 

Modified: pkg/src/java/build.xml
===================================================================
--- pkg/src/java/build.xml	2009-12-20 05:54:23 UTC (rev 21)
+++ pkg/src/java/build.xml	2009-12-22 00:10:49 UTC (rev 22)
@@ -28,18 +28,19 @@
   <property name="dist.name" value="${project}-${version.number}"/>
 
   <!-- directories -->
-  <property name="build.dir" value="src/java/build"/>
-  <property name="build.classes.dir" value="${build.dir}/classes"/>
-  <property name="src.dir" value="src/java/main"/>
-  <property name="lib.dir" value="src/java/lib"/>
-  <property name="doc.dir" value="inst/java/docs"/>
-  <property name="test.dir" value="src/java/test"/>
+  <property name="build.dir" location="build"/>
+  <property name="build.classes.dir" location="${build.dir}/classes"/>
+  <property name="src.dir" location="main"/>
+  <property name="lib.dir" location="lib"/>
+  <property name="doc.dir" location="docs"/>
+  <property name="test.dir" location="test"/>
+  <property name="pkg.dir" location="${basedir}/../.."/>
 
   <!-- files -->
   <property name="file.jar" value="${build.dir}/${dist.name}.jar"/>
 
   <!-- deployment -->
-  <property name="deploy.dir" value="${basedir}/inst/java"/>
+  <property name="deploy.dir" value="${pkg.dir}/inst/java"/>
   <property name="R.package" value="RMesquite"/>
 
   <!-- additional elements for classpath -->
@@ -149,7 +150,7 @@
 
   <target name="Rinstall" depends="deploy" 
           description="Install the R package">
-    <exec executable="R" dir="${basedir}/..">
+    <exec executable="R" dir="${pkg.dir}">
       <arg value="CMD"/>
       <arg value="INSTALL"/>
       <arg value="${R.package}"/>