commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject cvs commit: jakarta-commons-sandbox/sql build.xml
Date Thu, 23 Jan 2003 11:12:07 GMT
jstrachan    2003/01/23 03:12:07

  Modified:    sql      build.xml
  Log:
  regenerated the ant build file so it includes the license & manifest entry in the jar
  
  Revision  Changes    Path
  1.4       +159 -171  jakarta-commons-sandbox/sql/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/sql/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	6 Nov 2002 19:30:48 -0000	1.3
  +++ build.xml	23 Jan 2003 11:12:07 -0000	1.4
  @@ -1,212 +1,200 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
   <project default="jar" name="commons-sql" 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="resourcedir" value="src/java"></property>
  -  <property name="testresourcedir" value="."></property>
  -  
  -  
  -  <property name="distdir" value="dist"></property>
  -  <property name="javadocdir" value="target/docs/apidocs"></property>
  -  <property name="final.name" value="commons-sql-1.0-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-sql-1.0-dev">
  +  </property>
     <target name="init" description="o Initializes some properties">
  -    <mkdir dir="lib"></mkdir>
  +    <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="compile" description="o Compile the code" depends="get-deps">
  -    
  -    <mkdir dir="${classesdir}"></mkdir>
  -
  +    <mkdir dir="${classesdir}">
  +    </mkdir>
       <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false"
excludes="**/package.html">
         <src>
  -        <pathelement location="src/java"></pathelement>
  +        <pathelement location="src/java">
  +        </pathelement>
         </src>
         <classpath>
  -        <fileset dir="lib">
  -          <include name="*.jar"></include>
  +        <fileset dir="${libdir}">
  +          <include name="*.jar">
  +          </include>
           </fileset>
         </classpath>
       </javac>
  -    
  -    
  - 
  -    
  - 
  -    <copy todir="${classesdir}">
  -      
  -      <fileset dir="${resourcedir}">
  -      
  -      
  -        <include name="**/*.properties"></include>
  -      
  -        <include name="**/*.betwixt"></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>
  -
  +    <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
  +      <metainf dir="${basedir}">
  +        <include name="LICENSE.txt">
  +        </include>
  +      </metainf>
  +      <manifest>
  +        <attribute name="Built-By" value="${user.name}">
  +        </attribute>
  +        <attribute name="Created-By" value="Apache Jakarta Maven">
  +        </attribute>
  +        <attribute name="Package" value="org.apache.commons.sql">
  +        </attribute>
  +        <attribute name="Build-Jdk" value="${java.version}">
  +        </attribute>
  +        <section name="org.apache.commons.sql">
  +          <attribute name="Specification-Title" value="commons-sql">
  +          </attribute>
  +          <attribute name="Specification-Version" value="1.0-dev">
  +          </attribute>
  +          <attribute name="Specification-Vendor" value="Apache Software Foundation">
  +          </attribute>
  +          <attribute name="Implementation-Title" value="org.apache.commons.sql">
  +          </attribute>
  +          <attribute name="Implementation-Version" value="1.0-dev">
  +          </attribute>
  +          <attribute name="Implementation-Vendor" value="Apache Software Foundation">
  +          </attribute>
  +        </section>
  +      </manifest>
  +    </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*, RELEASE*">
  +      </fileset>
       </copy>
     </target>
  - 
     <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
  -    <fail message="There were test failures."></fail>
  +    <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="C:\workspace\sql"></sysproperty>
  -        <formatter type="xml"></formatter>
  -        <formatter usefile="true" type="plain"></formatter>
  -        <classpath>
  -          <fileset dir="lib">
  -            <include name="*.jar"></include>
  -          </fileset>
  -          <pathelement path="${testclassesdir}"></pathelement>
  -          <pathelement path="${classesdir}"></pathelement>
  -        </classpath>
  -        <batchtest todir="${testreportdir}">
  -          <fileset dir="src/test">
  -            
  -              <include name="**/Test*.java"></include>
  -            
  -            
  -            
  -            
  -            
  -          </fileset>
  -        </batchtest>
  -      </junit>
  -    
  +    <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="${libdir}">
  +          <include name="*.jar">
  +          </include>
  +        </fileset>
  +        <pathelement path="${testclassesdir}">
  +        </pathelement>
  +        <pathelement path="${classesdir}">
  +        </pathelement>
  +      </classpath>
  +      <batchtest todir="${testreportdir}">
  +        <fileset dir="src/test">
  +          <include name="**/Test*.java">
  +          </include>
  +        </fileset>
  +      </batchtest>
  +    </junit>
     </target>
  -
     <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>
  -        </src>
  -        <classpath>
  -          <fileset dir="lib">
  -            <include name="*.jar"></include>
  -          </fileset>
  -          <pathelement path="${classesdir}"></pathelement>
  -        </classpath>
  -      </javac>
  -
  -      
  -   
  -      
  -    
  +    <mkdir dir="${testclassesdir}">
  +    </mkdir>
  +    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false"
excludes="**/package.html">
  +      <src>
  +        <pathelement location="src/test">
  +        </pathelement>
  +      </src>
  +      <classpath>
  +        <fileset dir="${libdir}">
  +          <include name="*.jar">
  +          </include>
  +        </fileset>
  +        <pathelement path="${classesdir}">
  +        </pathelement>
  +      </classpath>
  +    </javac>
     </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="commons-sql 1.0-dev API"></property>
  - 
  +    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation.
All Rights Reserved.">
  +    </property>
  +    <property name="title" value="commons-sql 1.0-dev API">
  +    </property>
       <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true"
sourcepath="src/java" packagenames="org.apache.commons.sql.*">
         <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">
  -  
  -    
  -    <get dest="lib/commons-logging-1.0.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.1.jar"></get>
  -    <get dest="lib/commons-beanutils-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-SNAPSHOT.jar"></get>
  -    <get dest="lib/commons-betwixt-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-betwixt/jars/commons-betwixt-SNAPSHOT.jar"></get>
  -    <get dest="lib/jdbc-2.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jdbc/jars/jdbc-2.0.jar"></get>
  -    <get dest="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"></get>
  -    <get dest="lib/commons-collections-2.1-dev.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1-dev.jar"></get>
  -    <get dest="lib/commons-digester-1.2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.2.jar"></get>
  -    <get dest="lib/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar"></get>
  -    <get dest="lib/xerces-2.0.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.0.0.jar"></get>
  -    <get dest="lib/axion-1.0-dev.20020830.060007.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/axion/jars/axion-1.0-dev.20020830.060007.jar"></get>
  -    <get dest="lib/hsqldb-1.7.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/hsqldb/jars/hsqldb-1.7.1.jar"></get>
  -    
  -    <get dest="lib/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="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"></get>
  -    <get dest="lib/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"></get>
  -  </target>
  -
  -  
  -  
  -  
  -  
  -  
  -  
  -  
  -  
  -
  +    <get dest="${libdir}/commons-logging-1.0.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.1.jar">
  +    </get>
  +    <get dest="${libdir}/commons-beanutils-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-SNAPSHOT.jar">
  +    </get>
  +    <get dest="${libdir}/commons-betwixt-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-betwixt/jars/commons-betwixt-SNAPSHOT.jar">
  +    </get>
  +    <get dest="${libdir}/jdbc-2.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jdbc/jars/jdbc-2.0.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}/commons-collections-2.1-dev.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1-dev.jar">
  +    </get>
  +    <get dest="${libdir}/commons-digester-1.2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.2.jar">
  +    </get>
  +    <get dest="${libdir}/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar">
  +    </get>
  +    <get dest="${libdir}/xerces-2.0.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.0.0.jar">
  +    </get>
  +    <get dest="${libdir}/axion-1.0-dev.20020830.060007.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/axion/jars/axion-1.0-dev.20020830.060007.jar">
  +    </get>
  +    <get dest="${libdir}/hsqldb-1.7.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/hsqldb/jars/hsqldb-1.7.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="${maven.repo.remote}/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
  +    <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>
  +  </target>
  +</project>
  \ No newline at end of file
  
  
  

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


Mime
View raw message