carnold     2005/08/18 18:02:05

  Modified:    .        Tag: v1_2-branch build.xml
               docs     Tag: v1_2-branch HISTORY.txt
  Log:
  Bug 36268: Add 'release' target to build.xml
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.34.2.31 +36 -0     logging-log4j/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/build.xml,v
  retrieving revision 1.34.2.30
  retrieving revision 1.34.2.31
  diff -u -r1.34.2.30 -r1.34.2.31
  --- build.xml 19 Aug 2005 00:34:48 -0000      1.34.2.30
  +++ build.xml 19 Aug 2005 01:02:04 -0000      1.34.2.31
  @@ -114,6 +114,9 @@
       dist    - will create a complete distribution in dist/
                 Setting the env variable NO_JAVADOC will build the distribution
                 without running the javadoc target.
  +
  +    release - will create a complete distribution in dist/
  +              using stricter settings for public distribution.
       </echo>
     </target>
   
  @@ -183,6 +186,9 @@
     <!-- ================================================================= -->
     <target name="init">
       <tstamp />
  +    <property name="javac.includeAntRuntime" value="true"/>
  +    <property name="javac.includeJavaRuntime" value="false"/>
  +    <property name="javac.fork" value="false"/>
     </target>
   
     <target name="build" depends="init, build.core, build.examples, build.xml,
  @@ -205,6 +211,9 @@
                       ${stem}/or/jms/*.java"
              target="${javac.target}"
              source="${javac.source}"
  +           includeAntRuntime="${javac.includeAntRuntime}"
  +           includeJavaRuntime="${javac.includeJavaRuntime}"
  +           fork="${javac.fork}"
              deprecation="${deprecation}"
              debug="on">
         <classpath refid="compile.classpath"/>
  @@ -226,6 +235,9 @@
              excludes="misc/*"
              target="${javac.target}"
              source="${javac.source}"
  +           includeAntRuntime="${javac.includeAntRuntime}"
  +           includeJavaRuntime="${javac.includeJavaRuntime}"
  +           fork="${javac.fork}"
              deprecation="${deprecation}"
              debug="on"/>
       <rmic base="${javac.dest}" classname="examples.NumberCruncherServer"/>
  @@ -245,6 +257,9 @@
                        ${stem}/xml/Transform.java"
              target="${javac.target}"
              source="${javac.source}"
  +           includeAntRuntime="${javac.includeAntRuntime}"
  +           includeJavaRuntime="${javac.includeJavaRuntime}"
  +           fork="${javac.fork}"
              deprecation="${deprecation}"
              classpath="${classpath}">
         <classpath refid="compile.classpath"/>
  @@ -259,6 +274,9 @@
              includes="${stem}/net/SMTPAppender.java"
              target="${javac.target}"
              source="${javac.source}"
  +           includeAntRuntime="${javac.includeAntRuntime}"
  +           includeJavaRuntime="${javac.includeJavaRuntime}"
  +           fork="${javac.fork}"
              deprecation="${deprecation}">
         <classpath refid="compile.classpath"/>
       </javac>
  @@ -270,6 +288,9 @@
              includes="${stem}/net/JMS*.java, ${stem}/or/jms/*.java"
              target="${javac.target}"
              source="${javac.source}"
  +           includeAntRuntime="${javac.includeAntRuntime}"
  +           includeJavaRuntime="${javac.includeJavaRuntime}"
  +           fork="${javac.fork}"
              deprecation="${deprecation}">
         <classpath refid="compile.classpath"/>
       </javac>
  @@ -282,6 +303,9 @@
              excludes="${stem}/jmx/T.java"
              target="${javac.target}"
              source="${javac.source}"
  +           includeAntRuntime="${javac.includeAntRuntime}"
  +           includeJavaRuntime="${javac.includeJavaRuntime}"
  +           fork="${javac.fork}"
              deprecation="${deprecation}">
         <classpath refid="compile.classpath"/>
       </javac>
  @@ -575,5 +599,17 @@
       <delete dir="${dist.tmp}" />
     </target>
   
  +
  +    <!-- ================================================================= 
-->
  +    <!-- Build a complete distribution for release.                        
-->
  +    <!-- ================================================================= 
-->
  +   <target name="release">
  +        <property name="javac.includeAntRuntime" value="false"/>
  +        <property name="javac.includeJavaRuntime" value="false"/>
  +        <property name="javac.fork" value="true"/>
  +        <property name="build.compiler" value="classic"/>
  +
  +        <antcall target="dist"/>
  +   </target>
   </project>
   
  
  
  
  No                   revision
  No                   revision
  1.27.2.18 +3 -1      logging-log4j/docs/HISTORY.txt
  
  Index: HISTORY.txt
  ===================================================================
  RCS file: /home/cvs/logging-log4j/docs/HISTORY.txt,v
  retrieving revision 1.27.2.17
  retrieving revision 1.27.2.18
  diff -u -r1.27.2.17 -r1.27.2.18
  --- HISTORY.txt       19 Aug 2005 00:34:48 -0000      1.27.2.17
  +++ HISTORY.txt       19 Aug 2005 01:02:04 -0000      1.27.2.18
  @@ -13,7 +13,9 @@
      in org.apache.log4j.chainsaw.LoggingReceiver which would cause
      spurious compiler errors with JDK 1.1 and 1.2 javac compilers.
   
  - - Fixed bug 36267 by adding a jndi.jar property to the build file.
  + - Fixed bug 36267 by adding a jndi.jar property to the build.xml.
  +
  + - Fixed bug 37268 by adding "release" target to build.xml. 
   
    - Fixed bug 36213 by removing references to obsolete documentation.
    
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to