ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/ant Constants.java Main.java
Date Tue, 30 Jan 2001 00:15:31 GMT
donaldp     01/01/29 16:15:31

  Modified:    proposal/myrmidon build.xml
               proposal/myrmidon/lib avalonapi.jar
               proposal/myrmidon/src/java/org/apache/ant Main.java
  Added:       proposal/myrmidon/src/java/org/apache/ant Constants.java
  Log:
  Updated this to use the same approach as main wrt replacing constants in file .... strangely
this one works
  
  Revision  Changes    Path
  1.5       +9 -5      jakarta-ant/proposal/myrmidon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	2001/01/08 04:36:39	1.4
  +++ build.xml	2001/01/30 00:15:30	1.5
  @@ -51,7 +51,7 @@
     <property name="src.base" value="src"/>
     <property name="manifest.dir" value="${src.base}/manifest"/>
     <property name="xdocs.dir" value="${src.base}/xdocs"/>
  -  <property name="src.dir" value="${src.base}/java"/>
  +  <property name="java.dir" value="${src.base}/java"/>
     <property name="skins.dir" value="${src.base}/skins"/>
     <property name="script.dir" value="${src.base}/script"/>
     <property name="lib.dir" value="lib"/>
  @@ -68,7 +68,7 @@
     <property name="dist.conf" value="${dist.dir}/conf"/>
     <property name="dist.log" value="${dist.dir}/logs"/>
   
  -  <property name="constants.file" value="org/apache/ant/Main.java"/>
  +  <property name="constants.file" value="org/apache/ant/Constants.java"/>
   
     <!--
          ===================================================================
  @@ -135,7 +135,9 @@
     <target name="prepare-src" depends="prepare">
       <mkdir dir="${build.src}"/>
       <copy todir="${build.src}">
  -      <fileset dir="${src.dir}"/>
  +      <fileset dir="${java.dir}">
  +      <include name="${constants.file}" />
  +      </fileset>
       </copy>
    
       <replace file="${build.src}/${constants.file}" token="@@VERSION@@" value="${version}"
/>
  @@ -150,17 +152,19 @@
     <target name="compile" depends="prepare-src,prepare-lib">
   
       <mkdir dir="${build.classes}"/>
  -    <javac srcdir="${build.src}"
  +    <javac srcdir="${java.dir}"
              destdir="${build.classes}"
              debug="${debug}"
              optimize="${optimize}"
              deprecation="${deprecation}">
           <exclude name="org/apache/ant/gui/**"/>
  +        <exclude name="${constants.file}"/>
  +        <src path="${build.src}" />
       </javac>
   
   <!--
       <copy todir="${build.classes}">
  -      <fileset dir="${build.src}">
  +      <fileset dir="${java.dir}">
           <include name="**/*.properties"/>
         </fileset>
       </copy>
  
  
  
  1.8       +654 -724  jakarta-ant/proposal/myrmidon/lib/avalonapi.jar
  
  	<<Binary file>>
  
  
  1.7       +1 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/Main.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Main.java	2001/01/08 04:36:41	1.6
  +++ Main.java	2001/01/30 00:15:30	1.7
  @@ -58,10 +58,8 @@
       extends AbstractMain
   {
       //Constants to indicate the build of Ant/Myrmidon
  -    public final static String     BUILD_DATE                = "@@DATE@@";
  -    public final static String     BUILD_VERSION             = "@@VERSION@@";
       public final static String     VERSION                   = 
  -        "Ant " + BUILD_VERSION + " compiled on " + BUILD_DATE;
  +        "Ant " + Constants.BUILD_VERSION + " compiled on " + Constants.BUILD_DATE;
   
       //default log level
       protected final static String  DEFAULT_LOGLEVEL          = "WARN";
  
  
  
  1.1                  jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/Constants.java
  
  Index: Constants.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE file.
   */
  package org.apache.ant;
  
  /**
   * Abstract interface to hold constants.
   * 
   * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
   */
  interface Constants
  {
      //Constants to indicate the build of Ant/Myrmidon
      String  BUILD_DATE     = "@@DATE@@";
      String  BUILD_VERSION  = "@@VERSION@@";
  }
  
  
  

Mime
View raw message