dfs 02/02/01 01:38:20
Modified: . CHANGES
src/java/org/apache/oro/text/regex Perl5Substitution.java
Added: . .cvsignore build.properties build.xml
Removed: build .cvsignore ant-1.3.jar build.bat build.sh build.xml
jaxp.jar parser.jar
build/bin antRun
Log:
Moved build.xml out of build/ directory and removed all jars. From
now on you have to have ant installed already. build.xml and build.properties
still need to be fixed up, but this was a first step.
Revision Changes Path
1.23 +5 -1 jakarta-oro/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/jakarta-oro/CHANGES,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- CHANGES 25 Jan 2002 09:32:28 -0000 1.22
+++ CHANGES 1 Feb 2002 09:38:19 -0000 1.23
@@ -1,6 +1,10 @@
-$Id: CHANGES,v 1.22 2002/01/25 09:32:28 dfs Exp $
+$Id: CHANGES,v 1.23 2002/02/01 09:38:19 dfs Exp $
Version 2.0.x
+
+o Removed ant and support jars from distribution and moved build.xml to
+ top level directory. From now on, you must have ant installed on your
+ system to build the source.
o Added a strings.java example to the awk examples, better demonstrating
the character encoding issues associated with AwkMatcher's 8-bit
1.1 jakarta-oro/.cvsignore
Index: .cvsignore
===================================================================
velocity.log
1.1 jakarta-oro/build.properties
Index: build.properties
===================================================================
# ------------------------------------------------------------------------
# build.properties
#
# This file controls various properties which may be set during a build.
#
# This file is intended to be modified by users to accomadate their own
# working practices, or overridden by one of the property files specified
# in build.xml.
#
--------------------------------------------------------------------------
# Name and version information
name=Jakarta-ORO
project=jakarta-oro
version=2.0.5-dev1
# Name and version of the project
project.name=${project}-${version}
top.dir=.
year=2000-2002
jakarta-site2.dir=../jakarta-site2
code.src=${top.dir}/src
build.src=${top.dir}/src/java
build.dest=${top.dir}/classes
build.tests=${build.dest}/tests
javadoc.destdir=${top.dir}/docs/api
final.name=${project}-${version}
final.dir=${top.dir}/${final.name}
debug=off
optimize=on
deprecation=off
ant.home=.
docs.src=${top.dir}/xdocs
docs.dest=${top.dir}/docs
#
# The stuff below is for when we take another pass at cleaning up
# build.xml and making the properties more consistent.
#
# Temporary working directory. Specified on a per user basis
#tmp.dir=/tmp/${user.name}
tmp.dir=.
# Build directory
##build.dir=${tmp.dir}/${project.name}/build
#build.dir=${tmp.dir}/build
#src.dir=${top.dir}/src
#src.java.dir=${src.dir}/java
#doc.dir=${top.dir}/docs
#doc.java.dir=${doc.dir}/api
##doc.user.dir=${doc.dir}/user
##doc.printer.dir=${doc.dir}/printer
# Test results directory
#check.dir=${tmp.dir}/${project.name}/check
# Build properties
#build.debug=off
#build.deprecation=off
#build.optimize=on
#build.bin.dir=${build.dir}/bin
#build.lib.dir=${build.dir}/lib
#build.src.dir=${build.dir}/src/java
#build.data.dir=${build.dir}/conf
#build.doc.dir=${build.dir}/docs
#build.doc.java.dir=${build.dir}/docs/api
# Installation properties
#install.dir=./${project.name}
#install.bin.dir=${install.dir}/bin
#install.lib.dir=${install.dir}/lib
#install.src.dir=${install.dir}/src/java
#install.data.dir=${install.dir}/conf
#install.doc.dir=${install.dir}/docs
#install.doc.java.dir=${build.dir}/docs/api
# Document constants
#company.name=Apache Software Foundation
#copyright.date=2000-2002
#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)
#timestamp.longTimeDate.pattern=EEEE, d MMMM yyyy hh:mm:ss aa
#timestamp.shortTimeDate.pattern=dd/MM/yyyy HH:mm:ss
1.1 jakarta-oro/build.xml
Index: build.xml
===================================================================
<?xml version="1.0"?>
<!--
$Id: build.xml,v 1.1 2002/02/01 09:38:19 dfs Exp $
Notes:
This is a build file for use with the Jakarta Ant build tool.
Prerequisites:
jakarta-ant from http://jakarta.apache.org/ant/index.html
Build Instructions:
To build, run
ant <target>
in the directory where this file is located with the target you want.
Available targets (default == jar):
clean removes generated files
docs builds xml documentation
examples builds the example programs
awk-examples builds the awk example programs
jar builds lib + jar
javadocs builds the javadoc
lib builds the library
package builds lib + jar + javadoc + distribution
package-all builds package-zip and package-tgz
package-tgz builds a tarred and gzipped distribution
package-zip builds a zipped distribution
tools builds the tools
-->
<project default="jar">
<!-- Allow properties following these statements to be overridden -->
<!-- Note that all of these don't have to exist. They've just been defined
incase they are used. -->
<property file="build.properties"/>
<!--
<property file=".ant.properties"/>
<property file="${user.home}/.ant.properties"/>
<property file="default.properties"/>
-->
<!-- prepare target. Creates build directory. -->
<target name="prepare">
<mkdir dir="${build.dest}"/>
<mkdir dir="${build.tests}"/>
<mkdir dir="${docs.dest}"/>
<available file="${jakarta-site2.dir}/lib" type="dir"
property="AnakiaTask.present"/>
</target>
<target name="prepare-error" depends="prepare"
unless="AnakiaTask.present">
<echo>
AnakiaTask is not present! Please check to make sure that
velocity.jar is in your classpath.
</echo>
</target>
<!-- lib target. Compiles the library classes only -->
<target name="lib" depends="prepare">
<javac srcdir="${build.src}"
destdir="${build.dest}"
excludes="examples/**,tools/**"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}"/>
</target>
<!-- examples target. Compiles the example classes. -->
<target name="examples" depends="prepare,lib">
<javac srcdir="${build.src}/examples"
excludes="awk/**"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}"/>
</target>
<!-- awk-examples target. Compiles the example classes. -->
<target name="examples-awk" depends="prepare,lib">
<javac srcdir="${build.src}/examples/awk"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}"/>
</target>
<!-- tools target. Compiles the tool classes. -->
<target name="tools" depends="prepare,lib">
<javac srcdir="${build.src}/tools"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}"/>
</target>
<!-- tests target. Compiles and runs the unit tests. -->
<target name="tests" depends="prepare,lib">
<javac srcdir="${build.src}/tests"
destdir="${build.tests}"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}"/>
</target>
<!-- jar target. Compiles the source directory and creates a .jar file -->
<target name="jar" depends="lib">
<jar jarfile="${top.dir}/${final.name}.jar"
basedir="${build.dest}"
includes="org/**"
excludes="**/package.html,**/overview.html"/>
</target>
<!-- javadocs target. Creates the API documentation -->
<target name="javadocs" depends="prepare">
<mkdir dir="${javadoc.destdir}"/>
<javadoc
packagenames="org.apache.oro.io,org.apache.oro.text,org.apache.oro.text.regex,org.apache.oro.text.awk,org.apache.oro.text.perl,org.apache.oro.util"
sourcepath="${build.src}"
destdir="${javadoc.destdir}"
overview="${build.src}/org/apache/oro/overview.html"
author="true"
version="true"
windowtitle="${name} ${version} API"
doctitle="${name} ${version} API"
header="<a href='http://jakarta.apache.org/oro/'
target=_top><img src='{@docroot}/../images/logoSmall.gif'
alt='Jakarta ORO' width=48 height=47 align=center border=0 hspace=1
vspace=1></a>"
bottom="Copyright © ${year} Apache Software Foundation. All Rights
Reserved.">
</javadoc>
<replace file="${javadoc.destdir}/overview-frame.html"
token="{@docroot}" value="."/>
<replace dir="${javadoc.destdir}" includes="**/*.html"
token="@version@" value="${version}"/>
</target>
<!-- docs target. Creates project web pages and documentation. -->
<target name="docs" depends="prepare-error,lib,examples"
if="AnakiaTask.present">
<taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
<classpath>
<fileset dir="${jakarta-site2.dir}/lib">
<include name="*.jar"/>
</fileset>
</classpath>
</taskdef>
<anakia basedir="${docs.src}" destdir="${docs.dest}/"
extension=".html" style="./site.vsl"
projectFile="stylesheets/project.xml"
excludes="**/stylesheets/** manual/** empty.xml"
includes="**/*.xml"
lastModifiedCheck="true"
templatePath="${jakarta-site2.dir}/xdocs/stylesheets">
</anakia>
<copy todir="${docs.dest}/images" filtering="no">
<fileset dir="${docs.src}/images">
<include name="**/*.gif"/>
<include name="**/*.jpeg"/>
<include name="**/*.jpg"/>
</fileset>
</copy>
<mkdir dir="${docs.dest}/classes"/>
<copy todir="${docs.dest}/classes" filtering="no">
<fileset dir="${build.dest}">
<include name="MatcherDemoApplet.class"/>
</fileset>
</copy>
<mkdir dir="${docs.dest}/classes/org"/>
<copy todir="${docs.dest}/classes/org" filtering="no">
<fileset dir="${build.dest}/org">
<include name="**/*.class"/>
</fileset>
</copy>
</target>
<!-- package target -->
<target name="package" depends="jar,javadocs,docs">
<mkdir dir="${final.dir}"/>
<copy todir="${final.dir}/src">
<fileset dir="${code.src}"/>
</copy>
<!-- 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>
</copy>
<!-- END_REMOVE_THIS -->
<copy file="${top.dir}/build.xml" tofile="${final.dir}/build.xml"/>
<copy file="${top.dir}/build.properties"
tofile="${final.dir}/build.properties"/>
<copy file="${top.dir}/LICENSE" tofile="${final.dir}/LICENSE"/>
<copy file="${top.dir}/BUGS" tofile="${final.dir}/BUGS"/>
<copy file="${top.dir}/CHANGES" tofile="${final.dir}/CHANGES"/>
<copy file="${top.dir}/COMPILE" tofile="${final.dir}/COMPILE"/>
<copy file="${top.dir}/CONTRIBUTORS"
tofile="${final.dir}/CONTRIBUTORS"/>
<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"/>
</target>
<!-- package-zip target. Packages the distribution with ZIP -->
<target name="package-zip" depends="package">
<zip zipfile="${top.dir}/${final.name}.zip" basedir="${top.dir}/"
includes="**/${final.name}/**" excludes="**/.cvsignore"/>
</target>
<!-- Packages the distribution with TAR-GZIP -->
<target name="package-tgz" depends="package">
<tar tarfile="${top.dir}/${final.name}.tar"
basedir="${top.dir}" excludes="**/**">
<tarfileset dir="${final.dir}/..">
<include name="${final.name}/**"/>
<exclude name="**/.cvsignore"/>
</tarfileset>
</tar>
<gzip zipfile="${top.dir}/${project}-${version}.tar.gz"
src="${top.dir}/${project}-${version}.tar"/>
</target>
<!-- Packages the distribution with ZIP and TAG-GZIP -->
<target name="package-all" depends="package-zip, package-tgz">
</target>
<!-- Makes an attempt to clean up a little. -->
<target name="clean">
<delete dir="${build.dest}"/>
<delete dir="${javadoc.destdir}"/>
<delete dir="${final.dir}"/>
<!-- Remove this if any source documents ever reside in docs.dest. -->
<delete dir="${docs.dest}"/>
<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"/>
</target>
</project>
1.7 +2 -5
jakarta-oro/src/java/org/apache/oro/text/regex/Perl5Substitution.java
Index: Perl5Substitution.java
===================================================================
RCS file:
/home/cvs/jakarta-oro/src/java/org/apache/oro/text/regex/Perl5Substitution.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Perl5Substitution.java 17 May 2001 21:16:11 -0000 1.6
+++ Perl5Substitution.java 1 Feb 2002 09:38:20 -0000 1.7
@@ -58,7 +58,7 @@
*/
/*
- * $Id: Perl5Substitution.java,v 1.6 2001/05/17 21:16:11 dfs Exp $
+ * $Id: Perl5Substitution.java,v 1.7 2002/02/01 09:38:20 dfs Exp $
*/
import java.util.*;
@@ -279,10 +279,7 @@
// Positional params
if (c == '$') {
saveDigits = (nextc != '0' && Character.isDigit(nextc));
- }
-
- // Escape codes
- else if (c == '\\') {
+ } else if (c == '\\') { // Escape codes
if (nextc == 'l') {
if (!caseMode){
__addElement(_OPCODE_LOWERCASE_CHAR);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
