[DrJava] SF.net SVN: drjava: [3583] trunk/drjava/build.xml

[<dl...@us...>]

Revision: 3583
Author:   dlsmith
Date:     2006-03-09 14:11:05 -0800 (Thu, 09 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/drjava/?rev=3583&view=rev

Log Message:
-----------
Second test of build script for commit

Modified Paths:
--------------
    trunk/drjava/build.xml
Modified: trunk/drjava/build.xml
===================================================================
--- trunk/drjava/build.xml	2006-03-09 21:38:42 UTC (rev 3582)
+++ trunk/drjava/build.xml	2006-03-09 22:11:05 UTC (rev 3583)
@@ -126,10 +126,7 @@
   <!-- Clover tasks, used to generate test coverage reports -->
   <taskdef resource="clovertasks" classpath="lib/buildlib/clover.jar" />
 
-  <!-- svnAnt tasks, used to interface with the Subversion client -->
-  <taskdef resource="svntask.properties" classpath="lib/buildlib/svnant-all.jar" />
-  
-  
+                 
   <!-- ***********
        Help Target
        *********** -->
@@ -314,8 +311,8 @@
        Build Target
        ************ -->
   
-  <!-- Removed "test-14-in-15" for Subversion testing -->
-  <target name="build" depends="jar-14" 
+  <!-- removed test-14-in-15 and changed to jar-15 for testing Subversion -->
+  <target name="build" depends="jar-15" 
           description="Shortcut for 'test-14-in-15' and 'jar-14'">
   </target>
   
@@ -811,10 +808,12 @@
   
   <target name="update-svn" depends="clean" description="Reconcile source with the Subversion archive">
     <echo message="Running Subversion update" />
-    <svn>
-      <update dir="${basedir}" />
-      <status path="${basedir}" />
-    </svn>
+    <exec executable="svn" failonerror="yes">
+      <arg value="update" />
+    </exec>
+    <exec executable="svn" failonerror="yes">
+      <arg value="status" />
+    </exec>
   </target>
   
   <target name="commit-svn" depends="update-svn, build" 
@@ -823,32 +822,42 @@
       <param name="delete-jars" value="no" />
       <param name="clean-can-fail" value="no" />
     </antcall>
+    <exec executable="svn" failonerror="yes">
+      <arg value="status" />
+    </exec>
     <input message="Please enter a log message for the commit: "
            addproperty="svn-commit-message" />
     <echo message="Running Subversion commit" />
-    <svn>
-      <status path="${basedir}" />
-      <commit dir="${basedir}" message="${svn-commit-message}" />
-    </svn>
+    <exec executable="svn" failonerror="yes">
+      <arg value="commit" />
+      <arg value="-m" />
+      <arg value="${svn-commit-message}" />
+    </exec>
   </target>
 
   <target name="tag-svn" depends="resolve-version-tag" 
           description="Copy the working copy to a new Subversion tag">
     <echo message="Creating a new Subversion tag with name ${version-tag}"/>
-    <svn>
-      <copy srcpath="${basedir}" desturl="${svn-repository}/tags/${version-tag}"
-            message="Created tag ${version-tag}" />
-    </svn>
+    <exec executable="svn" failonerror="yes">
+      <arg value="copy" />
+      <arg value="${basedir}" />
+      <arg value="${svn-repository}/tags/${version-tag}" />
+      <arg value="-m" />
+      <arg value="Created tag ${version-tag}" />
+    </exec>
   </target>
   
   <target name="branch-svn" description="Copy the working copy to a new Subversion branch">
     <input message="Enter a name for the new branch: "
            addproperty="svn-branch-name" />
     <echo message="Creating a new Subversion branch ${svn-branch-name}" />
-    <svn>
-      <copy srcpath="${basedir}" desturl="${svn-repository}/branches/${svn-branch-name}"
-            message="Created branch ${svn-branch-name}" />
-    </svn>
+    <exec executable="svn" failonerror="yes">
+      <arg value="copy" />
+      <arg value="${base-dir}" />
+      <arg value="${svn-repository}/branches/${svn-branch-name}" />
+      <arg value="-m" />
+      <arg value="Created branch ${svn-branch-name}" />
+    </exec>
   </target>
 
 
@@ -951,9 +960,11 @@
   <target name="src-zip-svn" depends="resolve-version-tag">
     <echo message="Creating ${version-tag}-src.zip" />
     <mkdir dir="${version-tag}/src" />
-    <svn>
-      <export srcurl="${svn-repository}/tags/${version-tag}" destpath="${version-tag}/src" />
-    </svn>
+    <exec executable="svn" failonerror="yes">
+      <arg value="export" />
+      <arg value="${svn-repository}/tags/${version-tag}" />
+      <arg value="${version-tag}/src" />
+    </exec>
     <zip destfile="${version-tag}-src.zip">
       <zipfileset dir="${version-tag}/src" prefix="${version-tag}/src" />
     </zip>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.