commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mart...@apache.org
Subject cvs commit: jakarta-commons/io build.xml project.xml
Date Sun, 24 Oct 2004 00:51:53 GMT
martinc     2004/10/23 17:51:53

  Modified:    io       build.xml project.xml
  Log:
  Several updates:
   - Update current version to 1.1-dev
   - Add a version entry for 1.0
   - Enable Checkstyle report
   - Detab and make indentation consistent
   - Regenerate Ant build file
  
  Revision  Changes    Path
  1.18      +40 -35    jakarta-commons/io/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/io/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml	3 May 2004 02:29:00 -0000	1.17
  +++ build.xml	24 Oct 2004 00:51:53 -0000	1.18
  @@ -1,7 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
  -<!--build.xml generated by maven from project.xml version 1.0
  -  on date May 2 2004, time 2227-->
  +<!--build.xml generated by maven from project.xml version 1.1-dev
  +  on date October 23 2004, time 1747-->
   
   <project default="jar" name="commons-io" basedir=".">
     <property name="defaulttargetdir" value="target">
  @@ -12,14 +12,22 @@
     </property>
     <property name="testclassesdir" value="target/test-classes">
     </property>
  +  <property name="testclassesdir" value="target/test-classes">
  +  </property>
     <property name="testreportdir" value="target/test-reports">
     </property>
     <property name="distdir" value="dist">
     </property>
     <property name="javadocdir" value="dist/docs/api">
     </property>
  -  <property name="final.name" value="commons-io-1.0">
  +  <property name="final.name" value="commons-io-1.1-dev">
     </property>
  +  <path id="build.classpath">
  +    <fileset dir="${libdir}">
  +      <include name="**/*.jar">
  +      </include>
  +    </fileset>
  +  </path>
     <target name="init" description="o Initializes some properties">
       <mkdir dir="${libdir}">
       </mkdir>
  @@ -27,6 +35,10 @@
         <equals arg2="only" arg1="${build.sysclasspath}">
         </equals>
       </condition>
  +    <!--Test if JUNIT is present in ANT classpath-->
  +
  +    <available property="Junit.present" classname="junit.framework.Test">
  +    </available>
     </target>
     <target name="compile" description="o Compile the code" depends="get-deps">
       <mkdir dir="${classesdir}">
  @@ -36,14 +48,12 @@
           <pathelement location="src/java">
           </pathelement>
         </src>
  -      <classpath>
  -        <fileset dir="${libdir}">
  -          <include name="*.jar">
  -          </include>
  -        </fileset>
  +      <classpath refid="build.classpath">
         </classpath>
       </javac>
  -    <copy todir="${classesdir}">
  +    <mkdir dir="${classesdir}/META-INF">
  +    </mkdir>
  +    <copy todir="${classesdir}/META-INF">
         <fileset dir=".">
           <include name="NOTICE.txt">
           </include>
  @@ -51,7 +61,7 @@
       </copy>
     </target>
     <target name="jar" description="o Create the jar" depends="compile,test">
  -    <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
  +    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html"
basedir="${classesdir}">
       </jar>
     </target>
     <target name="clean" description="o Clean up the generated directories">
  @@ -74,7 +84,7 @@
       <fail message="There were test failures.">
       </fail>
     </target>
  -  <target name="internal-test" depends="compile-tests">
  +  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
       <mkdir dir="${testreportdir}">
       </mkdir>
       <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
  @@ -85,10 +95,8 @@
         <formatter usefile="false" type="plain">
         </formatter>
         <classpath>
  -        <fileset dir="${libdir}">
  -          <include name="*.jar">
  -          </include>
  -        </fileset>
  +        <path refid="build.classpath">
  +        </path>
           <pathelement path="${testclassesdir}">
           </pathelement>
           <pathelement path="${classesdir}">
  @@ -104,7 +112,12 @@
         </batchtest>
       </junit>
     </target>
  -  <target name="compile-tests" depends="compile">
  +  <target name="junit-present" unless="Junit.present" depends="init">
  +    <echo>================================= WARNING ================================</echo>
  +    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
  +    <echo>==========================================================================</echo>
  +  </target>
  +  <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
       <mkdir dir="${testclassesdir}">
       </mkdir>
       <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false"
excludes="**/package.html">
  @@ -113,16 +126,14 @@
           </pathelement>
         </src>
         <classpath>
  -        <fileset dir="${libdir}">
  -          <include name="*.jar">
  -          </include>
  -        </fileset>
  +        <path refid="build.classpath">
  +        </path>
           <pathelement path="${classesdir}">
           </pathelement>
         </classpath>
       </javac>
     </target>
  -  <target name="javadoc" description="o Generate javadoc" depends="jar">
  +  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
       <mkdir dir="${javadocdir}">
       </mkdir>
       <tstamp>
  @@ -131,28 +142,22 @@
       </tstamp>
       <property name="copyright" value="Copyright &amp;copy;  The Apache Software
Foundation. All Rights Reserved.">
       </property>
  -    <property name="title" value="IO 1.0 API">
  +    <property name="title" value="IO 1.1-dev API">
       </property>
       <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true"
sourcepath="src/java" packagenames="org.apache.commons.io.*">
         <classpath>
  -        <fileset dir="${libdir}">
  -          <include name="*.jar">
  -          </include>
  -        </fileset>
  -        <pathelement location="target/${final.name}.jar">
  -        </pathelement>
  +        <path refid="build.classpath">
  +        </path>
         </classpath>
       </javadoc>
     </target>
     <target name="get-deps" unless="noget" depends="init">
  +    <!--Proxy settings works only with a JDK 1.2 and higher.-->
  +
  +    <setproxy>
  +    </setproxy>
       <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
       </get>
  -    <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
  -    </get>
  -    <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
  -    </get>
  -    <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
  -    </get>
     </target>
     <target name="install-maven">
       <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
  @@ -160,4 +165,4 @@
       <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
       </unjar>
     </target>
  -</project>
  +</project>
  \ No newline at end of file
  
  
  
  1.32      +140 -146  jakarta-commons/io/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/io/project.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- project.xml	22 Sep 2004 02:05:21 -0000	1.31
  +++ project.xml	24 Oct 2004 00:51:53 -0000	1.32
  @@ -19,7 +19,7 @@
     
     <name>IO</name>
     <id>commons-io</id>
  -  <currentVersion>1.0</currentVersion>
  +  <currentVersion>1.1-dev</currentVersion>
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Commons IO</shortDescription>
     <description>
  @@ -37,11 +37,11 @@
     </organization>
   
     <licenses>
  -	<license>
  -    	<name>The Apache Software License, Version 2.0</name>
  -    	<url>/LICENSE.txt</url>
  -    	<distribution>repo</distribution>
  -	</license>
  +    <license>
  +      <name>The Apache Software License, Version 2.0</name>
  +      <url>/LICENSE.txt</url>
  +      <distribution>repo</distribution>
  +    </license>
     </licenses>
     
     <gumpRepositoryId>jakarta</gumpRepositoryId>
  @@ -70,149 +70,143 @@
       </mailingList>
     </mailingLists>
     
  -
  -    <developers>
  -        <developer>
  -            <name>Scott Sanders</name>
  -            <id>sanders</id>
  -            <email>sanders@apache.org</email>
  -            <organization></organization>
  -            <roles>
  -                <role>Java Developer</role>
  -            </roles>
  -        </developer>
  -
  -        <developer>
  -            <name>dIon Gillard</name>
  -            <id>dion</id>
  -            <email>dion@apache.org</email>
  -            <organization></organization>
  -            <roles>
  -                <role>Java Developer</role>
  -            </roles>
  -        </developer>
  -
  -        <developer>
  -            <name>Nicola Ken Barozzi</name>
  -            <id>nicolaken</id>
  -            <email>nicolaken@apache.org</email>
  -            <organization></organization>
  -            <roles>
  -                <role>Java Developer</role>
  -            </roles>
  -        </developer>
  -
  -        <developer>
  -            <name>Henri Yandell</name>
  -            <id>bayard</id>
  -            <email>bayard@apache.org</email>
  -            <organization></organization>
  -            <roles>
  -                <role>Java Developer</role>
  -            </roles>
  -        </developer>
  -
  -        <developer>
  -            <name>Stephen Colebourne</name>
  -            <id>scolebourne</id>
  -            <organization>SITA ATS</organization>
  -            <roles>
  -                <role>Java Developer</role>
  -            </roles>
  -        </developer>
  -
  -        <developer>
  -            <name>Jeremias Maerki</name>
  -            <id>jeremias</id>
  -            <email>jeremias@apache.org</email>
  -            <organization/>
  -            <roles>
  -                <role>Java Developer</role>
  -            </roles>
  -            <url>http://nagoya.apache.org/wiki/apachewiki.cgi?JeremiasMaerki</url>
  -            <timezone>+1</timezone>
  -        </developer>
  -
  -        <developer>
  -            <name>Matthew Hawthorne</name>
  -            <id>matth</id>
  -            <email>matth@apache.org</email>
  -            <organization/>
  -            <roles>
  -                <role>Java Developer</role>
  -            </roles>
  -        </developer>
  -
  -        <developer>
  -            <name>Martin Cooper</name>
  -            <id>martinc</id>
  -            <email>martinc@apache.org</email>
  -            <organization/>
  -            <roles>
  -                <role>Java Developer</role>
  -            </roles>
  -        </developer>
  -
  -    </developers>
  -
  -    <contributors>
  -        <contributor>
  -            <name>Alban Peignier</name>
  -            <email>alban.peignier at free.fr</email>
  -        </contributor>
  -        <contributor>
  -            <name>Jason Anderson</name>
  -        </contributor>
  -    </contributors>
  -
  -    <dependencies>
  -        <dependency>
  -            <id>junit</id>
  -            <version>3.8.1</version>
  -        </dependency>
  -    </dependencies>
  -
  -    <build>
  -    	<nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
  -    	<sourceDirectory>src/java</sourceDirectory>
  -    	<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
  -        <!-- Unit test classes -->
  -        <!-- TODO Organize test inclusions and exclusions -->
  -        <unitTest>
  -            <includes>
  -                <include>**/*Test*</include>
  -            </includes>
  -            <excludes>
  -                <exclude>**/testtools/**</exclude>
  -            </excludes>
  -        </unitTest>
  -
  -        <resources>
  -            <resource>
  -              <targetPath>META-INF</targetPath>
  -              <includes>
  -                <include>NOTICE.txt</include>
  -              </includes>
  -            </resource>
  -        </resources>
  -
  +  <versions>
  +    <version>
  +      <id>1.0</id>
  +      <name>1.0</name>
  +      <tag>IO_1_0</tag>
  +    </version>
  +  </versions>
  +
  +  <developers>
  +    <developer>
  +      <name>Scott Sanders</name>
  +      <id>sanders</id>
  +      <email>sanders@apache.org</email>
  +      <organization></organization>
  +      <roles>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +    <developer>
  +      <name>dIon Gillard</name>
  +      <id>dion</id>
  +      <email>dion@apache.org</email>
  +      <organization></organization>
  +      <roles>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +    <developer>
  +      <name>Nicola Ken Barozzi</name>
  +      <id>nicolaken</id>
  +      <email>nicolaken@apache.org</email>
  +      <organization></organization>
  +      <roles>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +    <developer>
  +      <name>Henri Yandell</name>
  +      <id>bayard</id>
  +      <email>bayard@apache.org</email>
  +      <organization></organization>
  +      <roles>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +    <developer>
  +      <name>Stephen Colebourne</name>
  +      <id>scolebourne</id>
  +      <organization>SITA ATS</organization>
  +      <roles>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +    <developer>
  +      <name>Jeremias Maerki</name>
  +      <id>jeremias</id>
  +      <email>jeremias@apache.org</email>
  +      <organization/>
  +      <roles>
  +        <role>Java Developer</role>
  +      </roles>
  +      <url>http://nagoya.apache.org/wiki/apachewiki.cgi?JeremiasMaerki</url>
  +      <timezone>+1</timezone>
  +    </developer>
  +    <developer>
  +      <name>Matthew Hawthorne</name>
  +      <id>matth</id>
  +      <email>matth@apache.org</email>
  +      <organization/>
  +      <roles>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +    <developer>
  +      <name>Martin Cooper</name>
  +      <id>martinc</id>
  +      <email>martinc@apache.org</email>
  +      <organization/>
  +      <roles>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +
  +  </developers>
  +
  +  <contributors>
  +    <contributor>
  +      <name>Alban Peignier</name>
  +      <email>alban.peignier at free.fr</email>
  +    </contributor>
  +    <contributor>
  +      <name>Jason Anderson</name>
  +    </contributor>
  +  </contributors>
  +
  +  <dependencies>
  +    <dependency>
  +      <id>junit</id>
  +      <version>3.8.1</version>
  +    </dependency>
  +  </dependencies>
  +
  +  <build>
  +    <nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
  +    <sourceDirectory>src/java</sourceDirectory>
  +    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
  +    <!-- Unit test classes -->
  +    <!-- TODO Organize test inclusions and exclusions -->
  +    <unitTest>
  +      <includes>
  +        <include>**/*Test*</include>
  +      </includes>
  +      <excludes>
  +        <exclude>**/testtools/**</exclude>
  +      </excludes>
  +    </unitTest>
  +    <resources>
  +      <resource>
  +        <targetPath>META-INF</targetPath>
  +          <includes>
  +            <include>NOTICE.txt</include>
  +          </includes>
  +        </resource>
  +      </resources>
       </build>
   
     <reports>
  -     <report>maven-changelog-plugin</report>
  -     <report>maven-changes-plugin</report>
  -     <!--report>maven-checkstyle-plugin</report-->
  -     <!--report>maven-clover-plugin</report-->
  -     <report>maven-developer-activity-plugin</report>
  -     <report>maven-file-activity-plugin</report>
  -     <report>maven-javadoc-plugin</report>
  -     <!--report>maven-jellydoc-plugin</report-->
  -     <report>maven-junit-report-plugin</report>
  -     <report>maven-jxr-plugin</report>
  -     <report>maven-license-plugin</report>
  -     <!--report>maven-linkcheck-plugin</report-->
  -     <!--report>maven-statcvs-plugin</report-->
  -     <!--report>maven-tasklist-plugin</report-->
  +    <report>maven-changelog-plugin</report>
  +    <report>maven-changes-plugin</report>
  +    <report>maven-checkstyle-plugin</report>
  +    <report>maven-developer-activity-plugin</report>
  +    <report>maven-file-activity-plugin</report>
  +    <report>maven-javadoc-plugin</report>
  +    <report>maven-jdepend-plugin</report>
  +    <report>maven-junit-report-plugin</report>
  +    <report>maven-jxr-plugin</report>
  +    <report>maven-license-plugin</report>
     </reports>
   
   </project>
  
  
  

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


Mime
View raw message