You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2002/08/07 18:00:26 UTC

cvs commit: jakarta-avalon-excalibur/fortress build.xml

bloritsch    2002/08/07 09:00:25

  Modified:    fortress build.xml
  Log:
  Update Fortress to create a big jar instead of using several tiny jars.
  
  Revision  Changes    Path
  1.37      +37 -10    jakarta-avalon-excalibur/fortress/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- build.xml	7 Aug 2002 04:55:55 -0000	1.36
  +++ build.xml	7 Aug 2002 16:00:25 -0000	1.37
  @@ -21,9 +21,10 @@
           <pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
           <pathelement location="${excalibur-event.jar}"/>
           <pathelement location="${excalibur-util.jar}"/>
  -        <pathelement location="${excalibur-component.jar}"/>
           <pathelement location="${excalibur-logger.jar}"/>
           <pathelement location="${excalibur-sourceresolve.jar}"/>
  +        <pathelement location="${excalibur-concurrent.jar}"/>
  +        <pathelement location="${excalibur-thread.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
           <pathelement path="${java.class.path}"/>
       </path>
  @@ -39,6 +40,7 @@
           <pathelement location="${build.testclasses}"/>
           <pathelement location="${junit.jar}"/>
           <pathelement location="${excalibur-testcase.jar}"/>
  +        <pathelement location="${excalibur-component.jar}"/>
           <pathelement location="${excalibur-datasource.jar}"/>
           <pathelement location="${excalibur-pool.jar}"/>
           <pathelement location="${excalibur-cache.jar}"/>
  @@ -46,16 +48,41 @@
           <pathelement location="${excalibur-xmlutil.jar}"/>
           <pathelement location="${excalibur-xmlbundle.jar}"/>
           <pathelement location="${excalibur-scratchpad.jar}"/>
  -        <pathelement location="${excalibur-concurrent.jar}"/>
  -        <pathelement location="${excalibur-thread.jar}"/>
           <pathelement location="${xalan.jar}"/>
           <pathelement location="${jaxen-full.jar}"/>
           <path refid="project.class.path"/>
       </path>
       <property name="cp" refid="test.class.path"/>
   
  -    <target name="main" depends="jar" description="Build the project"/>
  -    <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
  +    <target name="main" depends="big-jar" description="Build the project"/>
  +    <target name="rebuild" depends="main" description="Rebuild the project"/>
  +
  +    <target name="big-jar" description="Build the big jar with all dependencies included">
  +      <ant antfile="../build.xml" target="clean">
  +        <property name="basedir" value="../"/>
  +      </ant>
  +
  +      <ant target="jar"/>
  +
  +      <copy file="${excalibur-collections.jar}" todir="${build.dir}/tempjars"/>
  +      <copy file="${excalibur-instrument.jar}" todir="${build.dir}/tempjars"/>
  +      <copy file="${excalibur-instrument-manager.jar}" todir="${build.dir}/tempjars"/>
  +      <copy file="${excalibur-instrument-manager-interfaces.jar}" todir="${build.dir}/tempjars"/>
  +      <copy file="${excalibur-event.jar}" todir="${build.dir}/tempjars"/>
  +      <copy file="${excalibur-util.jar}" todir="${build.dir}/tempjars"/>
  +      <copy file="${excalibur-logger.jar}" todir="${build.dir}/tempjars"/>
  +      <copy file="${excalibur-sourceresolve.jar}" todir="${build.dir}/tempjars"/>
  +      <copy file="${excalibur-concurrent.jar}" todir="${build.dir}/tempjars"/>
  +      <copy file="${excalibur-thread.jar}" todir="${build.dir}/tempjars"/>
  +      <copy file="${build.lib}/${jar.name}" todir="${build.dir}/tempjars"/>
  +      <copy file="${build.lib}/${mpool.jar.name}" todir="${build.dir}/tempjars"/>
  +
  +      <jar destfile="${build.lib}/${name}-complete-${version}.jar">
  +        <zipgroupfileset dir="${build.dir}/tempjars">
  +          <include name="*.jar"/>
  +        </zipgroupfileset>
  +      </jar>
  +    </target>
   
       <target name="dependencies" description="Check dependencies" unless="skip.dependencies">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  @@ -416,16 +443,16 @@
       <target name="docs" depends="html-docs" description="generates all the Fortress documentation"/>
   
       <target name="html-docs" description="generates the xdocs-based documentation">
  -      <mkdir dir="${docs.dir}"/>      
  -      
  +      <mkdir dir="${docs.dir}"/>
  +
         <ant antfile="${basedir}/../cocoonbuild.xml"/>
  -      
  +
         <copy todir="${docs.dir}">
           <fileset dir="${build.docs}">
             <include name="**"/>
           </fileset>
  -      </copy>       
  -      
  +      </copy>
  +
       </target>
   
       <target name="site" depends="javadocs, docs" description=" Places Docs ready for hosting on website">
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>