jakarta-oro-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject cvs commit: jakarta-oro CHANGES build.properties build.xml
Date Tue, 15 Jun 2004 21:26:57 GMT
dfs         2004/06/15 14:26:57

  Modified:    .        CHANGES build.properties build.xml
  Log:
  broke up the master jar files into separate components:
     jakarta-oro       : all classes
     jakarta-oro-core  : required interfaces
     jakarta-oro-awk   : Awk engine
     jakarta-oro-glob  : Glob engine
     jakarta-oro-java  : Java engine
     jakarta-oro-perl5 : Perl5 engine
     jakarta-oro-util  : Remaining utility classes from text, io, and
                         util packages
     Also turned debug info back off because it inflates the jar file
     sizes which some people have been complaining about.
  
  Revision  Changes    Path
  1.42      +14 -1     jakarta-oro/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/jakarta-oro/CHANGES,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- CHANGES	15 Jun 2004 02:47:12 -0000	1.41
  +++ CHANGES	15 Jun 2004 21:26:57 -0000	1.42
  @@ -1,6 +1,19 @@
   $Id$
   
   Version 2.1-dev-1
  + o broke up the master jar files into separate components:
  +   jakarta-oro       : all classes
  +   jakarta-oro-core  : required interfaces
  +   jakarta-oro-awk   : Awk engine
  +   jakarta-oro-glob  : Glob engine
  +   jakarta-oro-java  : Java engine
  +   jakarta-oro-perl5 : Perl5 engine
  +   jakarta-oro-util  : Remaining utility classes from text, io, and util
  +                       packages
  +   Also turned debug info back off because it inflates the jar file sizes
  +   which some people have been complaining about.  If you need debug info,
  +   recompile the source with the debug property on.
  +
    o added the following classes in the new org.apache.oro.text.java package
      to wrap the J2SE 1.4 java.util.regex package:
       JavaCompiler.java         
  
  
  
  1.15      +15 -6     jakarta-oro/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-oro/build.properties,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.properties	4 Apr 2004 19:50:20 -0000	1.14
  +++ build.properties	15 Jun 2004 21:26:57 -0000	1.15
  @@ -23,7 +23,7 @@
   #
   
   # Name and version information
  -name=Jakarta-ORO
  +name=Jakarta ORO
   project=jakarta-oro
   version=2.1-dev-1
   
  @@ -43,13 +43,22 @@
   javadoc.destdir=${top.dir}/docs/api
   final.name=${project}-${version}
   final.dir=${top.dir}/${final.name}
  -debug=on
  +debug=off
   optimize=on
   deprecation=off
   ant.home=.
   docs.src=${top.dir}/xdocs
   docs.dest=${top.dir}/docs
   
  +# jar file names
  +jar.all.name=${project}-${version}.jar
  +jar.core.name=${project}-core-${version}.jar
  +jar.awk.name=${project}-awk-${version}.jar
  +jar.glob.name=${project}-glob-${version}.jar
  +jar.java.name=${project}-java-${version}.jar
  +jar.perl5.name=${project}-perl5-${version}.jar
  +jar.util.name=${project}-util-${version}.jar
  +
   #
   # The stuff below is for when we take another pass at cleaning up
   # build.xml and making the properties more consistent.
  @@ -93,10 +102,10 @@
   #install.doc.java.dir=${build.dir}/docs/api
   
   # Document constants
  -#company.name=The Apache Software Foundation
  +company.name=The Apache Software Foundation
     
  -#copyright.date=2000-2003
  -#copyright.message=Copyright © ${copyright.date} ${company.name}. All Rights Reserved.
  +copyright.date=2000-2004
  +copyright.message=Copyright © ${copyright.date} ${company.name}. All Rights Reserved.
   
   # Time stamp patterns
   #timestamp.fullTimeDate.pattern=EEEE, d MMMM yyyy hh:mm:ss aa (z)
  
  
  
  1.16      +75 -26    jakarta-oro/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-oro/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml	15 Jun 2004 04:03:20 -0000	1.15
  +++ build.xml	15 Jun 2004 21:26:57 -0000	1.16
  @@ -1,4 +1,24 @@
   <?xml version="1.0"?>
  +<!DOCTYPE project [
  +  <!ENTITY jarmanifest '
  +          <manifest>
  +            <section name="org/apache/oro">
  +             <attribute name="Specification-Title"
  +                     value="${name}" />
  +             <attribute name="Specification-Version"
  +                     value="${version}" />
  +             <attribute name="Specification-Vendor"
  +                     value="${company.name}" />
  +             <attribute name="Implementation-Title"
  +                     value="org.apache.oro" />
  +             <attribute name="Implementation-Version"
  +                     value="${version} ${DATE}" />
  +             <attribute name="Implementation-Vendor"
  +                     value="${company.name}" />
  +            </section>
  +           </manifest>'
  +  >
  +]>
   <!--
     $Id$
    
  @@ -154,27 +174,57 @@
       <!-- jar target.  Compiles the source directory and creates a .jar file -->
   
       <target name="jar" depends="compile"
  -          description="Compiles the source directory and creates a .jar file.">
  -        <jar jarfile="${top.dir}/${final.name}.jar"
  +          description="Compiles the source directory and creates .jar files.">
  +        <!-- Create master jar file. -->
  +        <jar jarfile="${top.dir}/${jar.all.name}"
               basedir="${build.dest}"
               includes="org/**,META-INF/**"
               excludes="**/package.html,**/overview.html">
  -          <manifest>
  -            <section name="org/apache/oro">
  -             <attribute name="Specification-Title"
  -                     value="Jakarta ORO" />
  -             <attribute name="Specification-Version"
  -                     value="${version}" />
  -             <attribute name="Specification-Vendor"
  -                     value="The Apache Software Foundation" />
  -             <attribute name="Implementation-Title"
  -                     value="org.apache.oro" />
  -             <attribute name="Implementation-Version"
  -                     value="${version} ${DATE}" />
  -             <attribute name="Implementation-Vendor"
  -                     value="The Apache Software Foundation" />
  -            </section>
  -           </manifest>
  +          &jarmanifest;
  +        </jar>
  +
  +        <!-- Create core jar file. -->
  +        <jar jarfile="${top.dir}/${jar.core.name}"
  +            basedir="${build.dest}"
  +            includes="org/apache/oro/text/regex/**,**/PatternMatchingEngineFactory.class,META-INF/**"
  +            excludes="**/Perl5**,**/OpCode.class,**/CharStringPointer.class">
  +          &jarmanifest;
  +        </jar>
  +
  +        <!-- Create awk jar file. -->
  +        <jar jarfile="${top.dir}/${jar.awk.name}"
  +            basedir="${build.dest}"
  +            includes="org/apache/oro/text/awk/**">
  +          &jarmanifest;
  +        </jar>
  +
  +        <!-- Create glob jar file. -->
  +        <jar jarfile="${top.dir}/${jar.glob.name}"
  +            basedir="${build.dest}"
  +            includes="org/apache/oro/text/Glob*">
  +          &jarmanifest;
  +        </jar>
  +
  +        <!-- Create java jar file. -->
  +        <jar jarfile="${top.dir}/${jar.java.name}"
  +            basedir="${build.dest}"
  +            includes="org/apache/oro/text/java/**">
  +          &jarmanifest;
  +        </jar>
  +
  +        <!-- Create perl5 jar file. -->
  +        <jar jarfile="${top.dir}/${jar.perl5.name}"
  +            basedir="${build.dest}"
  +            includes="org/apache/oro/text/perl/**,org/apache/oro/text/regex/Perl5**,**/OpCode.class,**/CharStringPointer.class">
  +          &jarmanifest;
  +        </jar>
  +
  +        <!-- Create util jar file. -->
  +        <jar jarfile="${top.dir}/${jar.util.name}"
  +            basedir="${build.dest}"
  +            includes="org/apache/oro/io/**,org/apache/oro/util/**,org/apache/oro/text/*.class"
  +            excludes="**/PatternMatchingEngineFactory.class,org/apache/oro/text/Glob*">
  +          &jarmanifest;
           </jar>
       </target>
   
  @@ -191,7 +241,7 @@
               windowtitle="${name} ${version} API"
               doctitle="${name} ${version} API"
               header="&lt;a href=&apos;http://jakarta.apache.org/oro/&apos; target=_top&gt;&lt;img
src=&apos;{@docroot}/../images/logoSmall.gif&apos; alt=&apos;Jakarta ORO&apos;
width=48 height=47 align=center border=0 hspace=1 vspace=1&gt;&lt;/a&gt;"
  -            bottom="Copyright &#169; ${year} The Apache Software Foundation. All Rights
Reserved.">
  +            bottom="${copyright.message}">
            </javadoc>
            <replace file="${javadoc.destdir}/overview-frame.html"
                     token="{@docroot}" value="."/>
  @@ -254,9 +304,7 @@
   	<!-- BEGIN_REMOVE_THIS -->
   	<!-- Remove this when there's a first draft of the manual. -->
           <copy todir="${final.dir}/docs">
  -            <fileset dir="${docs.dest}">
  -              <exclude name="manual/**"/>
  -	    </fileset>
  +            <fileset dir="${docs.dest}" excludes="manual/**"/>
           </copy>
   	<!-- END_REMOVE_THIS -->
   
  @@ -274,7 +322,9 @@
           <copy file="${top.dir}/README" tofile="${final.dir}/README"/>
           <copy file="${top.dir}/STYLE" tofile="${final.dir}/STYLE"/>
           <copy file="${top.dir}/TODO" tofile="${final.dir}/TODO"/>
  -        <copy file="${top.dir}/${final.name}.jar" tofile="${final.dir}/${final.name}.jar"/>
  +        <copy todir="${final.dir}/">
  +          <fileset dir="${top.dir}/" includes="*.jar"/>
  +        </copy>
       </target>
   
       <!-- package-zip target.  Packages the distribution with ZIP -->
  @@ -310,12 +360,11 @@
   	    description="Removes generated artifacts from source tree.">
           <delete dir="${build.dest}"/>
           <delete dir="${final.dir}"/>
  -        <delete file="${top.dir}/${final.name}.jar"/>
           <delete file="${top.dir}/${final.name}.tar"/>
           <delete file="${top.dir}/${final.name}.tar.gz"/>
           <delete file="${top.dir}/${final.name}.zip"/>
           <delete>
  -          <fileset dir="${top.dir}" includes="velocity.log*"/>
  +          <fileset dir="${top.dir}" includes="velocity.log*,*.jar"/>
           </delete>
   
       </target>
  
  
  

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


Mime
View raw message