You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2002/11/20 16:21:15 UTC

cvs commit: jakarta-ant/proposal/embed build.xml

bodewig     2002/11/20 07:21:15

  Modified:    proposal/embed build.xml
  Log:
  help Nicola build embed in Gump
  
  Revision  Changes    Path
  1.6       +19 -6     jakarta-ant/proposal/embed/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/embed/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	18 Oct 2002 21:50:31 -0000	1.5
  +++ build.xml	20 Nov 2002 15:21:15 -0000	1.6
  @@ -22,6 +22,7 @@
       
     <target name="build" depends="main" />
     <target name="main">
  +    <mkdir dir="${ant.home}/lib"/>
       <mkdir dir="build/classes" />
       <javac srcdir="src/java"  
              debug="${debug}"
  @@ -34,8 +35,7 @@
         <fileset dir="src/java" includes="META-INF/**" />
       </copy>
   
  -    <jar file="${embed.build}/ant-sax2.jar" basedir="${embed.build}/classes"
  -         manifest="src/java/META-INF/MANIFEST" >
  +    <jar file="${embed.build}/ant-sax2.jar" basedir="${embed.build}/classes">
         <include name="**" />
       </jar>
           
  @@ -50,6 +50,7 @@
     </target>
   
     <target name="embed-optional">
  +    <mkdir dir="${ant.home}/lib"/>
       <mkdir dir="build/classes" />
       <javac srcdir="src/java"  
              debug="${debug}"
  @@ -69,8 +70,7 @@
         <fileset dir="src/java" includes="META-INF/**" />
       </copy>
   
  -    <jar file="${embed.build}/optional-dynprop.jar" basedir="${embed.build}/classes"
  -         manifest="src/java/META-INF/MANIFEST" >
  +    <jar file="${embed.build}/optional-dynprop.jar" basedir="${embed.build}/classes">
         <include name="org/apache/tools/ant/taskdefs/optional/**" />
       </jar>
           
  @@ -89,7 +89,20 @@
            to recreate ant.jar ( using build/classes ) to include our code -->
       <unjar jar="${ant.src}/bootstrap/lib/ant.jar" dest="${embed.build}/classes" />
       <delete file="${ant.src}/bootstrap/lib/ant.jar" />
  -    <jar file="${ant.src}/bootstrap/lib/ant.jar" basedir="${embed.build}/classes"
  -         manifest="${embed.build}/classes/META-INF/MANIFEST" includes="**" />
  +    <jar file="${ant.src}/bootstrap/lib/ant.jar" basedir="${embed.build}/classes"/>
     </target>
  +
  +  <target name="install" description="Installs built jars">
  +    <echo message="${embed.build}/ant-sax2.jar toDir=${ant.home}/lib"/>
  +    <copy file="${embed.build}/ant-sax2.jar" toDir="${ant.home}/lib"/>
  +  </target>
  +
  +  <target name="install-embed" depends="main, install" 
  +          description="Installs core built jars"/>
  + 
  +  <target name="install-embed-optional" depends="embed-optional, install" 
  +          description="Installs extra built jars">
  +    <copy file="${commons-logging.jar}" toDir="${ant.home}/lib"/>
  +    <copy file="${commons-discovery.jar}" toDir="${ant.home}/lib"/>
  +  </target> 
   </project>
  
  
  

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