You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by ru...@locus.apache.org on 2000/04/26 23:21:04 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant Location.java
rubys 00/04/26 14:21:04
Modified: . build.xml
Added: src/main/org/apache/tools/ant Location.java
Log:
Cleanup things missed with JAXP/SAX 1.0 fixes
Revision Changes Path
1.18 +6 -5 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 2000/04/26 19:09:15 1.17
+++ build.xml 2000/04/26 21:21:03 1.18
@@ -16,10 +16,10 @@
<property name="src.dir" value="${basedir}/src/main"/>
<property name="lib.dir" value="lib"/>
<property name="docs.dir" value="docs"/>
- <property name="build.dir" value="build"/>
- <property name="build.classes" value="build/classes"/>
- <property name="build.javadocs" value="build/javadocs"/>
- <property name="ant.dist.dir" value="dist"/>
+ <property name="build.dir" value="../build"/>
+ <property name="build.classes" value="${build.dir}/classes"/>
+ <property name="build.javadocs" value="${build.dir}/javadocs"/>
+ <property name="ant.dist.dir" value="../dist"/>
<property name="classpath" value=""/>
<property name="packages" value="org.apache.tools.*"/>
@@ -56,7 +56,7 @@
destdir="${build.classes}"
classpath="${classpath}"
debug="on"
- deprecation="on"
+ deprecation="off"
optimize="on" >
<exclude name="**/Script.java" unless="bsf.present" />
<exclude name="**/NetRexxC.java" unless="netrexx.present" />
@@ -72,6 +72,7 @@
<!-- Creates the jar archive -->
<!-- =================================================================== -->
<target name="jar" depends="compile">
+ <mkdir dir="${lib.dir}"/>
<jar jarfile="${lib.dir}/${name}.jar"
basedir="${build.classes}"
includes="org/**"
1.1 jakarta-ant/src/main/org/apache/tools/ant/Location.java
Index: Location.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.tools.ant;
/**
* Stores the file name and line number in a file.
*/
public class Location {
private String fileName;
private int lineNumber;
private int columnNumber;
public static final Location UNKNOWN_LOCATION = new Location();
/**
* Creates an "unknown" location.
*/
private Location() {
this(null, 0, 0);
}
/**
* Creates a location consisting of a file name but no line number.
*/
public Location(String fileName) {
this(fileName, 0, 0);
}
/**
* Creates a location consisting of a file name and line number.
*/
public Location(String fileName, int lineNumber, int columnNumber) {
this.fileName = fileName;
this.lineNumber = lineNumber;
this.columnNumber = columnNumber;
}
/**
* Returns the file name, line number and a trailing space. An error
* message can be appended easily. For unknown locations, returns
* an empty string.
*/
public String toString() {
StringBuffer buf = new StringBuffer();
if (fileName != null) {
buf.append(fileName);
if (lineNumber != 0) {
buf.append(":");
buf.append(lineNumber);
}
buf.append(": ");
}
return buf.toString();
}
}
Re: cvs commit: jakarta-ant/src/main/org/apache/tools/ant Location.java
Posted by "Craig R. McClanahan" <Cr...@eng.sun.com>.
rubys@locus.apache.org wrote:
> rubys 00/04/26 14:21:04
>
> Modified: . build.xml
> Added: src/main/org/apache/tools/ant Location.java
> Log:
> Cleanup things missed with JAXP/SAX 1.0 fixes
>
> Revision Changes Path
> 1.18 +6 -5 jakarta-ant/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-ant/build.xml,v
> retrieving revision 1.17
> retrieving revision 1.18
> diff -u -r1.17 -r1.18
> --- build.xml 2000/04/26 19:09:15 1.17
> +++ build.xml 2000/04/26 21:21:03 1.18
> @@ -16,10 +16,10 @@
> <property name="src.dir" value="${basedir}/src/main"/>
> <property name="lib.dir" value="lib"/>
> <property name="docs.dir" value="docs"/>
> - <property name="build.dir" value="build"/>
> - <property name="build.classes" value="build/classes"/>
> - <property name="build.javadocs" value="build/javadocs"/>
> - <property name="ant.dist.dir" value="dist"/>
> + <property name="build.dir" value="../build"/>
> + <property name="build.classes" value="${build.dir}/classes"/>
> + <property name="build.javadocs" value="${build.dir}/javadocs"/>
> + <property name="ant.dist.dir" value="../dist"/>
>
Umm, how about
<property name="build.dir" value="../build/ant"/>
<property name="ant.dist.dir" value="../dist/ant"/>
instead?
Craig