You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by jk...@apache.org on 2004/01/21 02:46:34 UTC

cvs commit: jakarta-commons/cli build.xml project.xml

jkeyes      2004/01/20 17:46:34

  Modified:    cli      Tag: RESEARCH_CLI_2_ROXSPRING build.xml project.xml
  Log:
  cli 2 research
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.6.1   +118 -109  jakarta-commons/cli/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.6.1
  diff -u -r1.2 -r1.2.6.1
  --- build.xml	16 Oct 2002 22:16:26 -0000	1.2
  +++ build.xml	21 Jan 2004 01:46:34 -0000	1.2.6.1
  @@ -1,158 +1,167 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
  +<!--build.xml generated by maven from project.xml version 2.0-roxpsring-pre-alpha
  +  on date January 21 2004, time 0142-->
  +
   <project default="jar" name="commons-cli" basedir=".">
  -  
  -  <property name="defaulttargetdir" value="target"></property> 
  -  <property name="classesdir" value="target/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="target/docs/apidocs"></property>
  -  <property name="final.name" value="commons-cli-1.0-beta-2-dev"></property>
  -  
  +  <property name="defaulttargetdir" value="target">
  +  </property>
  +  <property name="libdir" value="target/lib">
  +  </property>
  +  <property name="classesdir" value="target/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-cli-2.0-roxpsring-pre-alpha">
  +  </property>
     <target name="init" description="o Initializes some properties">
  -
  +    <mkdir dir="${libdir}">
  +    </mkdir>
       <condition property="noget">
  -      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
  +      <equals arg2="only" arg1="${build.sysclasspath}">
  +      </equals>
       </condition>
     </target>
  -    
  -  <target name="jar" description="o Create the jar" depends="get-deps">
  -
  -    <mkdir dir="${classesdir}"></mkdir>
  -
  +  <target name="compile" description="o Compile the code" depends="get-deps">
  +    <mkdir dir="${classesdir}">
  +    </mkdir>
       <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
         <src>
  -        <pathelement location="src/java"></pathelement>
  +        <pathelement location="/Volumes/data/apache_workspace/jakarta-commons/cli_HEAD/src/java">
  +        </pathelement>
         </src>
         <classpath>
  -        <fileset dir="lib">
  -          <include name="*.jar"></include>
  +        <fileset dir="${libdir}">
  +          <include name="*.jar">
  +          </include>
           </fileset>
         </classpath>
       </javac>
  -
  -    
  -    <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
  -
  +    <copy todir="${classesdir}">
  +      <fileset dir="/Volumes/data/apache_workspace/jakarta-commons/cli_HEAD/src/java/org/apache/commons/cli2">
  +        <include name="**/*.properties">
  +        </include>
  +      </fileset>
  +    </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>
     </target>
  -  
     <target name="clean" description="o Clean up the generated directories">
  -    <delete dir="${defaulttargetdir}"></delete>
  -    <delete dir="${distdir}"></delete>
  +    <delete dir="${defaulttargetdir}">
  +    </delete>
  +    <delete dir="${distdir}">
  +    </delete>
     </target>
  -
     <target name="dist" description="o Create a distribution" depends="jar, javadoc">
  -    <mkdir dir="dist"></mkdir>
  +    <mkdir dir="dist">
  +    </mkdir>
       <copy todir="dist">
  -      <fileset dir="${defaulttargetdir}"></fileset>
  +      <fileset dir="${defaulttargetdir}" includes="*.jar">
  +      </fileset>
  +      <fileset dir="${basedir}" includes="LICENSE*, README*">
  +      </fileset>
       </copy>
     </target>
  - 
  -  <target name="test" description="o Run the test cases" depends="compile-tests">
  -    <mkdir dir="${testreportdir}"></mkdir>
  -    <junit dir="./" printSummary="yes" fork="true" haltonerror="true">
  -      <sysproperty key="basedir" value="src/test"></sysproperty>
  -      <formatter type="xml"></formatter>
  -      <formatter usefile="true" type="plain"></formatter>
  +  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
  +    <fail message="There were test failures.">
  +    </fail>
  +  </target>
  +  <target name="internal-test" depends="compile-tests">
  +    <mkdir dir="${testreportdir}">
  +    </mkdir>
  +    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
  +      <sysproperty key="basedir" value=".">
  +      </sysproperty>
  +      <formatter type="xml">
  +      </formatter>
  +      <formatter usefile="false" type="plain">
  +      </formatter>
         <classpath>
  -        <fileset dir="lib">
  -          <include name="*.jar"></include>
  +        <fileset dir="${libdir}">
  +          <include name="*.jar">
  +          </include>
           </fileset>
  -        <pathelement location="target/${final.name}.jar"></pathelement>
  -        <pathelement path="${testclassesdir}"></pathelement>
  +        <pathelement path="${testclassesdir}">
  +        </pathelement>
  +        <pathelement path="${classesdir}">
  +        </pathelement>
         </classpath>
         <batchtest todir="${testreportdir}">
  -        <fileset dir="src/test">
  -              
  -                <include name="**/*Test*.java"></include>
  -              
  -              
  +        <fileset dir="/Volumes/data/apache_workspace/jakarta-commons/cli_HEAD/src/test">
  +          <include name="**/*Test.java">
  +          </include>
  +          <include name="**/Test*.java">
  +          </include>
           </fileset>
         </batchtest>
       </junit>
     </target>
  -
  -  <target name="compile-tests" depends="jar">
  -    <mkdir dir="${testclassesdir}"></mkdir>
  +  <target name="compile-tests" depends="compile">
  +    <mkdir dir="${testclassesdir}">
  +    </mkdir>
       <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
         <src>
  -        <pathelement location="src/test"></pathelement>
  +        <pathelement location="/Volumes/data/apache_workspace/jakarta-commons/cli_HEAD/src/test">
  +        </pathelement>
         </src>
         <classpath>
  -        <fileset dir="lib">
  -          <include name="*.jar"></include>
  +        <fileset dir="${libdir}">
  +          <include name="*.jar">
  +          </include>
           </fileset>
  -        <pathelement location="target/${final.name}.jar"></pathelement>
  +        <pathelement path="${classesdir}">
  +        </pathelement>
         </classpath>
       </javac>
  -
  -    
  -   
  -    
  - 
  -    <copy todir="${testclassesdir}">
  -      <fileset dir="src/test">
  -      
  -      
  -      </fileset>
  -    </copy>
  -    
     </target>
  -
     <target name="javadoc" description="o Generate javadoc" depends="jar">
  - 
  - 
  -    <mkdir dir="${javadocdir}"></mkdir>
  - 
  -    
  +    <mkdir dir="${javadocdir}">
  +    </mkdir>
       <tstamp>
  -      <format pattern="2002-yyyy" property="year"></format>
  +      <format pattern="2002-yyyy" property="year">
  +      </format>
       </tstamp>
  - 
  -    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved."></property>
  - 
  -    <property name="title" value="CLI 1.0-beta-2-dev API"></property>
  - 
  -    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.cli.*">
  +    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
  +    </property>
  +    <property name="title" value="CLI 2.0-roxpsring-pre-alpha API">
  +    </property>
  +    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="/Volumes/data/apache_workspace/jakarta-commons/cli_HEAD/src/java" packagenames="org.apache.commons.*.*">
         <classpath>
  -        <fileset dir="lib">
  -          <include name="*.jar"></include>
  +        <fileset dir="${libdir}">
  +          <include name="*.jar">
  +          </include>
           </fileset>
  -        <pathelement location="target/${final.name}.jar"></pathelement>
  +        <pathelement location="target/${final.name}.jar">
  +        </pathelement>
         </classpath>
       </javadoc>
  - 
     </target>
  -
     <target name="get-deps" unless="noget" depends="init">
  -  
  -    <mkdir dir="lib"></mkdir>
  -    
  -    <get dest="lib/commons-logging-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.jar"></get>
  -    <get dest="lib/commons-lang-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-SNAPSHOT.jar"></get>
  -    <get dest="lib/junit-3.7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.7.jar"></get>
  -  
  +    <get dest="${libdir}/commons-logging-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.jar">
  +    </get>
  +    <get dest="${libdir}/commons-lang-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-1.0.jar">
  +    </get>
  +    <get dest="${libdir}/junit-3.8.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.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="${maven.repo.remote}/maven/maven-install-latest.jar"></get>
  -    
  -    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
  -    
  +    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
  +    </get>
  +    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
  +    </unjar>
     </target>
  -
  -</project>
  -    
  \ No newline at end of file
  +</project>
  \ No newline at end of file
  
  
  
  1.16.2.1  +68 -12    jakarta-commons/cli/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/project.xml,v
  retrieving revision 1.16
  retrieving revision 1.16.2.1
  diff -u -r1.16 -r1.16.2.1
  --- project.xml	11 Jan 2004 01:36:35 -0000	1.16
  +++ project.xml	21 Jan 2004 01:46:34 -0000	1.16.2.1
  @@ -1,22 +1,14 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
   <project>
  -  <extend>../project.xml</extend>
     <id>commons-cli</id>
     <name>CLI</name>
   
  -  <currentVersion>1.0</currentVersion>
  -
  -  <organization>
  -    <name>Apache Software Foundation</name>
  -    <url>http://www.apache.org</url>
  -    <logo>http://jakarta.apache.org/images/jakarta-logo.gif</logo>
  -  </organization>
  -
  +  <currentVersion>2.0-roxpsring-pre-alpha</currentVersion>
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Commons CLI</shortDescription>
     <gumpRepositoryId>jakarta</gumpRepositoryId>
  -  <logo>/images/logo.png</logo>
  +  <logo>/images/1x1.gif</logo>
     
     <description>
     	Commons CLI provides a simple API for working with the command line arguments and options.
  @@ -41,6 +33,12 @@
         <email>jbjk@mac.com</email>
         <organization>integral Source</organization>
       </developer>
  +    <developer>
  +      <name>Rob Oxspring</name>
  +      <id>roxspring</id>
  +      <email>roxspring@imapmail.org</email>
  +      <organization></organization>
  +    </developer>
     </developers>
   
     <contributors>
  @@ -78,17 +76,75 @@
     
       <dependency>
         <id>junit</id>
  -      <version>3.7</version>
  +      <version>3.8</version>
       </dependency>
     
     </dependencies>
  +
  +  <organization>
  +    <name>Apache Software Foundation</name>
  +    <url>http://www.apache.org</url>
  +    <logo>http://jakarta.apache.org/images/jakarta-logo-blue.gif</logo>
  +  </organization>
  +  <logo>/images/logo.jpg</logo>
  +  <package>org.apache.commons.*</package>
  +  <gumpRepositoryId>jakarta</gumpRepositoryId>
  +  
  +  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/index.html</url>
  +  <issueTrackingUrl>http://nagoya.apache.org/</issueTrackingUrl>
  +  
  +  <siteAddress>jakarta.apache.org</siteAddress>
  +  <siteDirectory>/www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</siteDirectory>
  +  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</distributionDirectory>
  +  
  +  <repository>
  +    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-commons/${pom.artifactId.substring(8)}</connection>
  +    <url>http://cvs.apache.org/viewcvs/jakarta-commons/${pom.artifactId.substring(8)}/</url>
  +  </repository>
     
  +  <mailingLists>
  +    <mailingList>
  +      <name>Commons Dev List</name>
  +      <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
  +      <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
  +      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
  +    </mailingList>
  +    <mailingList>
  +      <name>Commons User List</name>
  +      <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
  +      <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
  +      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
  +    </mailingList>
  +  </mailingLists>
  +
     <build>
  +    <nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
  +    <sourceDirectory>src/java</sourceDirectory>
  +    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
  +    <integrationUnitTestSourceDirectory/>
  +    <aspectSourceDirectory/>
  +
       <!-- Unit test classes -->
       <unitTest>
         <includes>
  -        <include>**/*Test*.java</include>
  +        <include>**/*Test.java</include>
  +        <include>**/Test*.java</include>
         </includes>
       </unitTest>
  +
  +    <!-- Integration unit test classes -->
  +    <integrationUnitTestPatterns></integrationUnitTestPatterns>
  +    
  +    <resources>
  +        <resource>
  +          <directory>src/java/org/apache/commons/cli2</directory>
  +          <targetPath>org/apache/commons/cli2</targetPath>
  +          <includes>
  +            <include>**/*.properties</include>
  +          </includes>
  +        </resource>
  +    </resources>
  +    
  +    <jars></jars>
     </build>
   </project>
  
  
  

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