ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r161885 - in ant/sandbox/antlibs: antunit/trunk/ antunit/trunk/build.xml dotnet/branches/Ant_1.6.2_compatible/ dotnet/branches/Ant_1.6.2_compatible/build.xml dotnet/trunk/ dotnet/trunk/build.xml svn/trunk/ svn/trunk/build.xml
Date Tue, 19 Apr 2005 13:24:54 GMT
Author: bodewig
Date: Tue Apr 19 06:24:52 2005
New Revision: 161885

URL: http://svn.apache.org/viewcvs?view=rev&rev=161885
Log:
Make sandboxes build

Modified:
    ant/sandbox/antlibs/antunit/trunk/   (props changed)
    ant/sandbox/antlibs/antunit/trunk/build.xml
    ant/sandbox/antlibs/dotnet/branches/Ant_1.6.2_compatible/   (props changed)
    ant/sandbox/antlibs/dotnet/branches/Ant_1.6.2_compatible/build.xml
    ant/sandbox/antlibs/dotnet/trunk/   (props changed)
    ant/sandbox/antlibs/dotnet/trunk/build.xml
    ant/sandbox/antlibs/svn/trunk/   (props changed)
    ant/sandbox/antlibs/svn/trunk/build.xml

Propchange: ant/sandbox/antlibs/antunit/trunk/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Apr 19 06:24:52 2005
@@ -0,0 +1 @@
+common          http://svn.apache.org/repos/asf/ant/antlibs/common/trunk

Modified: ant/sandbox/antlibs/antunit/trunk/build.xml
URL: http://svn.apache.org/viewcvs/ant/sandbox/antlibs/antunit/trunk/build.xml?view=diff&r1=161884&r2=161885
==============================================================================
--- ant/sandbox/antlibs/antunit/trunk/build.xml (original)
+++ ant/sandbox/antlibs/antunit/trunk/build.xml Tue Apr 19 06:24:52 2005
@@ -14,80 +14,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project default="compile">
+<project default="compile" name="antunit">
 
-  <target name="setup">
-    <property name="build" value="build"/>
-    <property name="build.classes" value="${build}/classes"/>
-    <property name="build.testclasses" value="${build}/test-classes"/>
-    <property name="build.lib" value="${build}/lib"/>
-    <property name="jarname" value="${build.lib}/ant-antunit.jar"/>
-    <mkdir dir="${build.classes}"/>
-    <mkdir dir="${build.testclasses}"/>
-    <mkdir dir="${build.lib}"/>
-  </target>
+  <!-- easy way to override properties -->
+  <property file="build.properties"/>
 
-  <target name="compile" depends="setup">
-    <javac 
-      srcdir="src/main"
-      destdir="${build.classes}"
-      debug="true"
-      />
-  </target>
-
-  <target name="antlib" depends="compile">
-    <copy todir="${build.classes}">
-      <fileset dir="src/main" includes="**/antlib.xml"/>
-    </copy>
-    <jar 
-      destfile="${jarname}"
-      basedir="${build.classes}"
-      />
-  </target>
-
-  <target name="setup-for-tests" depends="setup">
-    <ant 
-      antfile="../../../build.xml" 
-      target="test-jar" 
-      inheritall="false"
-      />
-  </target>
-
-  <target name="compile-tests" depends="setup-for-tests, antlib">
-    <javac 
-      srcdir="src/testcases"
-      destdir="${build.testclasses}"
-      debug="true"
-      >
-      <classpath>
-        <pathelement location="${jarname}"/>
-        <pathelement location="../../../build/lib/ant-testutil.jar"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile-tests">
-    <junit
-      printsummary="false"
-      haltonfailure="false"
-      failureproperty="tests.failed"
-      filtertrace="false"
-      fork="true"
-      forkmode="once"
-      >
-      <classpath>
-        <pathelement location="${jarname}"/>
-        <pathelement location="../../../build/lib/ant-testutil.jar"/>
-        <pathelement location="${build.testclasses}"/>
-      </classpath>
-
-      <batchtest>
-        <fileset dir="src/testcases"/>
-      </batchtest>
-
-      <formatter type="plain" usefile="false"/>
-    </junit>
-
-    <fail if="tests.failed">At least one test has failed.</fail>
-  </target>
+  <import file="common/build.xml"/>
 </project>

Propchange: ant/sandbox/antlibs/dotnet/branches/Ant_1.6.2_compatible/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Apr 19 06:24:52 2005
@@ -0,0 +1 @@
+common          http://svn.apache.org/repos/asf/ant/antlibs/common/trunk

Modified: ant/sandbox/antlibs/dotnet/branches/Ant_1.6.2_compatible/build.xml
URL: http://svn.apache.org/viewcvs/ant/sandbox/antlibs/dotnet/branches/Ant_1.6.2_compatible/build.xml?view=diff&r1=161884&r2=161885
==============================================================================
--- ant/sandbox/antlibs/dotnet/branches/Ant_1.6.2_compatible/build.xml (original)
+++ ant/sandbox/antlibs/dotnet/branches/Ant_1.6.2_compatible/build.xml Tue Apr 19 06:24:52
2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright  2003-2004 The Apache Software Foundation
+ Copyright  2003-2005 The Apache Software Foundation
  
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -14,56 +14,28 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project default="compile">
+<project default="compile" name="dotnet">
 
-  <target name="setup">
-    <property name="build" value="build"/>
-    <property name="build.classes" value="${build}/classes"/>
-    <property name="build.testclasses" value="${build}/test-classes"/>
-    <property name="build.lib" value="${build}/lib"/>
-    <property name="jarname" value="${build.lib}/dotnet.jar"/>
-    <mkdir dir="${build.classes}"/>
-    <mkdir dir="${build.testclasses}"/>
-    <mkdir dir="${build.lib}"/>
-  </target>
+  <!-- easy way to override properties -->
+  <property file="build.properties"/>
 
-  <target name="compile" depends="setup">
-    <javac 
-      srcdir="src/main"
-      destdir="${build.classes}"
-      debug="true"
-      />
-  </target>
+  <import file="common/build.xml"/>
 
-  <target name="antlib" depends="compile">
-    <copy todir="${build.classes}">
-      <fileset dir="src/main" includes="**/antlib.xml"/>
-    </copy>
-    <jar 
-      destfile="${jarname}"
-      basedir="${build.classes}"
-      />
-  </target>
-
-  <target name="setup-for-tests" depends="setup">
-    <ant 
-      antfile="../../../build.xml" 
-      target="test-jar" 
-      inheritall="false"
-      />
-  </target>
-
-  <target name="compile-tests" depends="setup-for-tests, antlib">
-    <javac 
-      srcdir="src/testcases"
-      destdir="${build.testclasses}"
-      debug="true"
-      >
-      <classpath>
-        <pathelement location="${jarname}"/>
-        <pathelement location="../../../build/lib/ant-testutil.jar"/>
-      </classpath>
-    </javac>
+  <!-- override setup target, make sure this is not Ant 1.7 or later -->
+  <target name="setup" depends="common.setup">
+    <condition property="good-ant-version?">
+      <and>
+        <!-- Ant 1.6.2+ -->
+        <available
+          classname="org.apache.tools.ant.DynamicConfiguratorNS"/>
+        <not>
+          <!-- Ant 1.7+ -->
+          <available
+            classname="org.apache.tools.ant.taskdefs.repository.Libraries"/>
+        </not>
+      </and>
+    </condition>
+    <fail unless="good-ant-version?">This branch must be built using Ant 1.6.x with
x &gt;= 2</fail>
   </target>
 
   <target name="test" depends="compile-tests">
@@ -72,11 +44,14 @@
       haltonfailure="false"
       failureproperty="tests.failed"
       filtertrace="false"
+      fork="true"
+      forkmode="once"
       >
       <classpath>
         <pathelement location="${jarname}"/>
-        <pathelement location="../../../build/lib/ant-testutil.jar"/>
+        <pathelement location="${ant-testutil.jar}"/>
         <pathelement location="${build.testclasses}"/>
+        <pathelement location="${ant.home}/lib/ant-nodeps.jar"/>
       </classpath>
 
       <batchtest>

Propchange: ant/sandbox/antlibs/dotnet/trunk/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Apr 19 06:24:52 2005
@@ -0,0 +1 @@
+common          http://svn.apache.org/repos/asf/ant/antlibs/common/trunk

Modified: ant/sandbox/antlibs/dotnet/trunk/build.xml
URL: http://svn.apache.org/viewcvs/ant/sandbox/antlibs/dotnet/trunk/build.xml?view=diff&r1=161884&r2=161885
==============================================================================
--- ant/sandbox/antlibs/dotnet/trunk/build.xml (original)
+++ ant/sandbox/antlibs/dotnet/trunk/build.xml Tue Apr 19 06:24:52 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright  2003-2004 The Apache Software Foundation
+ Copyright  2003-2005 The Apache Software Foundation
  
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -14,57 +14,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project default="compile">
+<project default="compile" name="dotnet">
 
-  <target name="setup">
-    <property name="build" value="build"/>
-    <property name="build.classes" value="${build}/classes"/>
-    <property name="build.testclasses" value="${build}/test-classes"/>
-    <property name="build.lib" value="${build}/lib"/>
-    <property name="jarname" value="${build.lib}/dotnet.jar"/>
-    <mkdir dir="${build.classes}"/>
-    <mkdir dir="${build.testclasses}"/>
-    <mkdir dir="${build.lib}"/>
-  </target>
+  <!-- easy way to override properties -->
+  <property file="build.properties"/>
 
-  <target name="compile" depends="setup">
-    <javac 
-      srcdir="src/main"
-      destdir="${build.classes}"
-      debug="true"
-      />
-  </target>
-
-  <target name="antlib" depends="compile">
-    <copy todir="${build.classes}">
-      <fileset dir="src/main" includes="**/antlib.xml"/>
-    </copy>
-    <jar 
-      destfile="${jarname}"
-      basedir="${build.classes}"
-      />
-  </target>
-
-  <target name="setup-for-tests" depends="setup">
-    <ant 
-      antfile="../../../build.xml" 
-      target="test-jar" 
-      inheritall="false"
-      />
-  </target>
-
-  <target name="compile-tests" depends="setup-for-tests, antlib">
-    <javac 
-      srcdir="src/testcases"
-      destdir="${build.testclasses}"
-      debug="true"
-      >
-      <classpath>
-        <pathelement location="${jarname}"/>
-        <pathelement location="../../../build/lib/ant-testutil.jar"/>
-      </classpath>
-    </javac>
-  </target>
+  <import file="common/build.xml"/>
 
   <target name="test" depends="compile-tests">
     <junit
@@ -72,11 +27,14 @@
       haltonfailure="false"
       failureproperty="tests.failed"
       filtertrace="false"
+      fork="true"
+      forkmode="once"
       >
       <classpath>
         <pathelement location="${jarname}"/>
-        <pathelement location="../../../build/lib/ant-testutil.jar"/>
+        <pathelement location="${ant-testutil.jar}"/>
         <pathelement location="${build.testclasses}"/>
+        <pathelement location="${ant.home}/lib/ant-nodeps.jar"/>
       </classpath>
 
       <batchtest>

Propchange: ant/sandbox/antlibs/svn/trunk/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Apr 19 06:24:52 2005
@@ -0,0 +1 @@
+common          http://svn.apache.org/repos/asf/ant/antlibs/common/trunk

Modified: ant/sandbox/antlibs/svn/trunk/build.xml
URL: http://svn.apache.org/viewcvs/ant/sandbox/antlibs/svn/trunk/build.xml?view=diff&r1=161884&r2=161885
==============================================================================
--- ant/sandbox/antlibs/svn/trunk/build.xml (original)
+++ ant/sandbox/antlibs/svn/trunk/build.xml Tue Apr 19 06:24:52 2005
@@ -14,78 +14,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project default="compile">
+<project default="compile" name="svn">
 
-  <target name="setup">
-    <property name="build" value="build"/>
-    <property name="build.classes" value="${build}/classes"/>
-    <property name="build.testclasses" value="${build}/test-classes"/>
-    <property name="build.lib" value="${build}/lib"/>
-    <property name="jarname" value="${build.lib}/ant-svn.jar"/>
-    <mkdir dir="${build.classes}"/>
-    <mkdir dir="${build.testclasses}"/>
-    <mkdir dir="${build.lib}"/>
-  </target>
+  <!-- easy way to override properties -->
+  <property file="build.properties"/>
 
-  <target name="compile" depends="setup">
-    <javac 
-      srcdir="src/main"
-      destdir="${build.classes}"
-      debug="true"
-      />
-  </target>
-
-  <target name="antlib" depends="compile">
-    <copy todir="${build.classes}">
-      <fileset dir="src/main" includes="**/antlib.xml"/>
-    </copy>
-    <jar 
-      destfile="${jarname}"
-      basedir="${build.classes}"
-      />
-  </target>
-
-  <target name="setup-for-tests" depends="setup">
-    <ant 
-      antfile="../../../build.xml" 
-      target="test-jar" 
-      inheritall="false"
-      />
-  </target>
-
-  <target name="compile-tests" depends="setup-for-tests, antlib">
-    <javac 
-      srcdir="src/testcases"
-      destdir="${build.testclasses}"
-      debug="true"
-      >
-      <classpath>
-        <pathelement location="${jarname}"/>
-        <pathelement location="../../../build/lib/ant-testutil.jar"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile-tests">
-    <junit
-      printsummary="false"
-      haltonfailure="false"
-      failureproperty="tests.failed"
-      filtertrace="false"
-      >
-      <classpath>
-        <pathelement location="${jarname}"/>
-        <pathelement location="../../../build/lib/ant-testutil.jar"/>
-        <pathelement location="${build.testclasses}"/>
-      </classpath>
-
-      <batchtest>
-        <fileset dir="src/testcases"/>
-      </batchtest>
-
-      <formatter type="plain" usefile="false"/>
-    </junit>
-
-    <fail if="tests.failed">At least one test has failed.</fail>
-  </target>
+  <import file="common/build.xml"/>
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message