[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jakarta-commons-dev
Subject:    cvs commit: jakarta-commons/logging build.xml
From:       craigmcc () apache ! org
Date:       2003-03-31 0:38:22
[Download RAW message or body]

craigmcc    2003/03/30 16:38:22

  Modified:    logging  build.xml
  Log:
  Copy LICENSE.txt file into distribution, and make sure it is included in the
  JAR files, without going to the directory above the top-level directory.
  This will make it easier to build commons-logging from source distros.
  
  Revision  Changes    Path
  1.31      +9 -8      jakarta-commons/logging/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/logging/build.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- build.xml	31 Mar 2003 00:20:19 -0000	1.30
  +++ build.xml	31 Mar 2003 00:38:22 -0000	1.31
  @@ -168,9 +168,10 @@
             description="Compile shareable components"/>
   
     <target name="compile-only" depends="init" >
  +
       <available property="jdk.1.4.present"
                  classname="java.util.logging.Logger"/>
  -    <available classname="org.apache.log4j.Category"
  +    <available classname="org.apache.log4j.Logger"
                  classpathref="compile.classpath"
                  property="log4j.present"/>
       <available property="logkit.present"
  @@ -181,7 +182,6 @@
       <echo  message="log4j.present=${log4j.present}"/>
       <echo  message="logkit.present=${logkit.present}"/>
   
  -
       <javac srcdir="${source.home}"
              destdir="${build.home}/classes"
              debug="${compile.debug}"
  @@ -200,11 +200,15 @@
       <copy  todir="${build.home}/classes" filtering="on">
         <fileset dir="${source.home}" excludes="**/*.java"/>
       </copy>
  +    <mkdir      dir="${build.home}/classes/META-INF"/>
  +    <copy      file="LICENSE.txt"
  +              todir="${build.home}/classes/META-INF"/>
   
       <jar jarfile="${build.home}/commons-${component.name}.jar"
            basedir="${build.home}/classes"
            manifest="${build.home}/conf/MANIFEST.MF">
         <include name="org/apache/commons/logging/**" />
  +      <include name="META-INF/LICENSE.txt"/>
       </jar>
   
       <jar jarfile="${build.home}/commons-${component.name}-api.jar"
  @@ -215,6 +219,7 @@
         <include name="org/apache/commons/logging/impl/Jdk14*.class" />
         <include name="org/apache/commons/logging/impl/SimpleLog*.class" />
         <include name="org/apache/commons/logging/impl/NoOpLog*.class" />
  +      <include name="META-INF/LICENSE.txt"/>
       </jar>
     </target>
   
  @@ -282,13 +287,9 @@
   
     <target name="dist" depends="compile,javadoc"
      description="Create binary distribution">
  -    <!-- TODO: top level files like LICENSE and README -->
       <mkdir      dir="${dist.home}"/>
  -    <copy      file="../LICENSE"
  +    <copy      file="LICENSE.txt"
                 todir="${dist.home}"/>
  -    <mkdir      dir="${build.home}/classes/META-INF"/>
  -    <copy      file="../LICENSE"
  -             tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
       <copy file="${build.home}/commons-${component.name}.jar"
             tofile="${dist.home}/commons-${component.name}.jar" />
       <copy file="${build.home}/commons-${component.name}-api.jar"
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org

[prev in list] [next in list] [prev in thread] [next in thread]