ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-ant-myrmidon build.xml
Date Thu, 09 May 2002 07:50:05 GMT
adammurdoch    02/05/09 00:50:05

  Modified:    antlib   project.xml
               ant1compat project.xml
               api      project.xml
               aut      project.xml
               buildtools project.xml
               container project.xml
               framework project.xml
               myrmidon project.xml
               .        build.xml
  Log:
  Project descriptor tidy-up:
  - Removed unused <package> elements.
  - Removed checks for ant1.5.
  - Framework now compiles if tools.jar not present.
  - Renamed myrmidon project to, er, 'myrmidon'.
  
  Revision  Changes    Path
  1.6       +0 -1      jakarta-ant-myrmidon/antlib/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	5 May 2002 13:24:55 -0000	1.5
  +++ project.xml	9 May 2002 07:50:05 -0000	1.6
  @@ -3,7 +3,6 @@
       <id>myrmidon-antlibs</id>
       <currentVersion>1.0</currentVersion>
       <copyrightYear>2000-2002</copyrightYear>
  -    <package>org.apache.antlib</package>
   
       <classpath>
           <fileset dir="../api/build/lib" includes="*.jar"/>
  
  
  
  1.6       +0 -7      jakarta-ant-myrmidon/ant1compat/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	23 Apr 2002 02:07:14 -0000	1.5
  +++ project.xml	9 May 2002 07:50:05 -0000	1.6
  @@ -3,7 +3,6 @@
       <id>myrmidon-ant1-compat</id>
       <currentVersion>1.0</currentVersion>
       <copyrightYear>2002</copyrightYear>
  -    <package>org.apache.tools.ant</package>
   
       <property name="build.ant1classes" value="${build.dir}/ant1classes"/>
   
  @@ -52,12 +51,6 @@
   
       <unitTest>
           <sourceDirectory>src/test</sourceDirectory>
  -
  -        <unitTestPatterns>
  -            <!-- Need Ant1.5+ to run Ant1Compat tests, because of classpath
  -                 problems in Ant1.4 JUnit Task (prepends ant.jar to classpath) -->
  -            <exclude name="**/Ant1CompatTestCase.*" unless="ant1.5"/>
  -        </unitTestPatterns>
   
           <classpath>
               <fileset dir="../container/build/lib" includes="*.jar"/>
  
  
  
  1.6       +0 -5      jakarta-ant-myrmidon/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/api/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	22 Apr 2002 06:52:31 -0000	1.5
  +++ project.xml	9 May 2002 07:50:05 -0000	1.6
  @@ -11,11 +11,6 @@
       <!-- Copyright year(s) -->
       <copyrightYear>2000-2002</copyrightYear>
   
  -    <!-- Java packages for the project -->
  -    <package>org.apache.myrmidon.api</package>
  -    <package>org.apache.myrmidon.listeners</package>
  -    <package>org.apache.myrmidon.aspects</package>
  -
       <!-- Project classpath -->
       <classpath>
           <fileset dir="../lib" includes="*.jar"/>
  
  
  
  1.7       +0 -3      jakarta-ant-myrmidon/aut/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/aut/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	23 Apr 2002 06:27:07 -0000	1.6
  +++ project.xml	9 May 2002 07:50:05 -0000	1.7
  @@ -11,9 +11,6 @@
       <!-- Copyright year(s) -->
       <copyrightYear>2000-2002</copyrightYear>
   
  -    <!-- Java packages for the project -->
  -    <package>org.apache.aut</package>
  -
       <!-- Project classpath -->
       <classpath>
           <fileset dir="../lib" includes="*.jar"/>
  
  
  
  1.5       +0 -1      jakarta-ant-myrmidon/buildtools/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	22 Apr 2002 06:52:31 -0000	1.4
  +++ project.xml	9 May 2002 07:50:05 -0000	1.5
  @@ -3,7 +3,6 @@
       <id>myrmidon-buildtools</id>
       <currentVersion>1.0</currentVersion>
       <copyrightYear>2000-2002</copyrightYear>
  -    <package>org.apache.myrmidon.build</package>
   
       <build>
           <sourceDirectory>src/java</sourceDirectory>
  
  
  
  1.8       +0 -2      jakarta-ant-myrmidon/container/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	23 Apr 2002 06:27:07 -0000	1.7
  +++ project.xml	9 May 2002 07:50:05 -0000	1.8
  @@ -4,8 +4,6 @@
       <currentVersion>1.0</currentVersion>
       <copyrightYear>2000-2002</copyrightYear>
   
  -    <package>org.apache.myrmidon</package>
  -
       <classpath>
           <fileset dir="../api/build/lib" includes="*.jar"/>
           <fileset dir="../aut/build/lib" includes="*.jar"/>
  
  
  
  1.6       +6 -2      jakarta-ant-myrmidon/framework/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/framework/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	26 Apr 2002 03:22:24 -0000	1.5
  +++ project.xml	9 May 2002 07:50:05 -0000	1.6
  @@ -3,8 +3,6 @@
       <id>myrmidon-framework</id>
       <currentVersion>1.0</currentVersion>
       <copyrightYear>2000-2002</copyrightYear>
  -    <package>org.apache.myrmidon.framework</package>
  -    <package>org.apache.tools.todo</package>
   
       <classpath>
           <fileset dir="../aut/build/lib" includes="*.jar"/>
  @@ -53,6 +51,8 @@
               <available property="stylebook.present"
                   classname="org.apache.stylebook.Engine"
                   classpathref="project.class.path"/>
  +            <available property="tools.present"
  +                       classname="sun.tools.native2ascii.Main"/>
           </prepare>
   
           <compilePatterns>
  @@ -78,6 +78,10 @@
                        unless="stylebook.present"/>
               <exclude name="org/apache/tools/todo/taskdefs/junit/Xalan1Executor.*"
                        unless="xalan.present"/>
  +            <exclude name="org/apache/tools/todo/taskdefs/text/Native2Ascii.*"
  +                     unless="tools.present"/>
  +            <exclude name="org/apache/tools/todo/taskdefs/Javah.*"
  +                     unless="tools.present"/>
           </compilePatterns>
   
           <jar>
  
  
  
  1.4       +2 -2      jakarta-ant-myrmidon/myrmidon/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/myrmidon/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	8 May 2002 04:10:27 -0000	1.3
  +++ project.xml	9 May 2002 07:50:05 -0000	1.4
  @@ -1,6 +1,6 @@
   <project>
  -    <name>Myrmidon Distribution</name>
  -    <id>myrmidon-distribution</id>
  +    <name>Myrmidon</name>
  +    <id>myrmidon</id>
       <currentVersion>1.0</currentVersion>
       <copyrightYear>2000-2002</copyrightYear>
   
  
  
  
  1.16      +1 -1      jakarta-ant-myrmidon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml	4 May 2002 03:43:11 -0000	1.15
  +++ build.xml	9 May 2002 07:50:05 -0000	1.16
  @@ -72,7 +72,7 @@
       </target>
       <target name="dist" description="Creates the distribution">
           <antcall target="-for-all-projects">
  -            <param name="build-subproject.target" value="dist-lite"/>
  +            <param name="build-subproject.target" value="dist"/>
           </antcall>
       </target>
   
  
  
  

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


Mime
View raw message