ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/etc manifest.bootstrap manifest
Date Wed, 02 Oct 2002 13:39:11 GMT
bodewig     2002/10/02 06:39:11

  Modified:    .        WHATSNEW build.xml
               src/etc  manifest
  Added:       src/etc  manifest.bootstrap
  Log:
  Remove Class-Path from Ant's manifest and provide an ant-bootstrap.jar
  for people who'd like to run Ant via java -jar.
  
  Revision  Changes    Path
  1.296     +8 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.295
  retrieving revision 1.296
  diff -u -r1.295 -r1.296
  --- WHATSNEW	30 Sep 2002 09:40:39 -0000	1.295
  +++ WHATSNEW	2 Oct 2002 13:39:11 -0000	1.296
  @@ -6,6 +6,14 @@
   
   * Targets cannot have the empty string as their name any longer.
   
  +* ant.jar's manifest does no longer include a Class-Path entry, so it
  +  is no longer possible to run Ant via "java -jar ant.jar" without
  +  manually altering the CLASSPATH.  Instead of that a file
  +  ant-bootstrap.jar is included in the etc directory of the binary
  +  distribution, copy this to the lib directory and use 
  +  "java -jar ant-bootstrap.jar" instead if you want to run Ant without
  +  the wrapper script (not recommended).
  +
   Fixed bugs:
   -----------
   
  
  
  
  1.322     +14 -1     jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.321
  retrieving revision 1.322
  diff -u -r1.321 -r1.322
  --- build.xml	26 Sep 2002 12:34:27 -0000	1.321
  +++ build.xml	2 Oct 2002 13:39:11 -0000	1.322
  @@ -22,6 +22,7 @@
     <property name="name" value="ant"/>
     <property name="version" value="1.6alpha"/>
     <property name="manifest-version" value="1.5.9"/>
  +  <property name="bootstrap.jar" value="ant-bootstrap.jar"/>
   
     <property name="debug" value="true"/>
     <property name="chmod.fail" value="true"/>
  @@ -737,6 +738,13 @@
         </manifest>
       </jar>
   
  +    <jar destfile="${build.lib}/${bootstrap.jar}"
  +         basedir="${build.classes}"
  +         manifest="${manifest}.bootstrap">
  +      <include name="${ant.package}/Main.class"/>
  +      <metainf dir="${build.dir}" includes="LICENSE.txt"/>
  +    </jar>
  +
     </target>
   
     <!--   Creates jar of test utility classes -->
  @@ -764,7 +772,9 @@
       <mkdir dir="${dist.lib}"/>
   
       <copy todir="${dist.lib}">
  -      <fileset dir="${build.lib}"/>
  +      <fileset dir="${build.lib}">
  +        <exclude name="${bootstrap.jar}"/>
  +      </fileset>
       </copy>
   
       <copy todir="${dist.bin}">
  @@ -876,6 +886,9 @@
               <include name="log.xsl"/>
               <include name="tagdiff.xsl"/>
           </fileset>
  +      <fileset dir="${build.lib}">
  +        <include name="${bootstrap.jar}"/>
  +      </fileset>
       </copy>
   
     </target>
  
  
  
  1.5       +0 -1      jakarta-ant/src/etc/manifest
  
  Index: manifest
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/manifest,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- manifest	22 Jun 2002 23:38:30 -0000	1.4
  +++ manifest	2 Oct 2002 13:39:11 -0000	1.5
  @@ -1,5 +1,4 @@
   Manifest-Version: 1.0
   Main-Class: org.apache.tools.ant.Main
  -Class-Path: xml-apis.jar xercesImpl.jar optional.jar xalan.jar
   
   
  
  
  
  1.1                  jakarta-ant/src/etc/manifest.bootstrap
  
  Index: manifest.bootstrap
  ===================================================================
  Manifest-Version: 1.0
  Main-Class: org.apache.tools.ant.Main
  Class-Path: ant.jar xml-apis.jar xercesImpl.jar optional.jar xalan.jar
  
  
  
  
  

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


Mime
View raw message