You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oro-dev@jakarta.apache.org by df...@apache.org on 2001/05/16 06:58:14 UTC
cvs commit: jakarta-oro/build ant-1.3.jar jaxp.jar parser.jar build-oro.bat build-oro.sh build-oro.xml ant.jar xml.jar
dfs 01/05/15 21:58:13
Modified: build build-oro.bat build-oro.sh build-oro.xml
Added: build ant-1.3.jar jaxp.jar parser.jar
Removed: build ant.jar xml.jar
Log:
Upgraded to ant-1.3.
Revision Changes Path
1.3 +2 -2 jakarta-oro/build/build-oro.bat
Index: build-oro.bat
===================================================================
RCS file: /home/cvs/jakarta-oro/build/build-oro.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-oro.bat 2000/09/15 05:10:17 1.2
+++ build-oro.bat 2001/05/16 04:58:09 1.3
@@ -1,6 +1,6 @@
@echo off
-REM $Id: build-oro.bat,v 1.2 2000/09/15 05:10:17 dfs Exp $
+REM $Id: build-oro.bat,v 1.3 2001/05/16 04:58:09 dfs Exp $
REM --------------------------------------------
REM Default == jar
REM "lib" target builds the library
@@ -30,7 +30,7 @@
if "%JAVA_HOME%" == "" goto javahomeerror
if exist %JAVA_HOME%\lib\tools.jar set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
-set CP=%CLASSPATH%;ant.jar;xml.jar
+set CP=%CLASSPATH%;ant-1.3.jar;parser.jar
echo Classpath: %CP%
echo JAVA_HOME: %JAVA_HOME%
1.3 +17 -9 jakarta-oro/build/build-oro.sh
Index: build-oro.sh
===================================================================
RCS file: /home/cvs/jakarta-oro/build/build-oro.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-oro.sh 2000/09/15 05:10:18 1.2
+++ build-oro.sh 2001/05/16 04:58:09 1.3
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# $Id: build-oro.sh,v 1.2 2000/09/15 05:10:18 dfs Exp $
+# $Id: build-oro.sh,v 1.3 2001/05/16 04:58:09 dfs Exp $
#
# --------------------------------------------
@@ -14,8 +14,17 @@
# "javadocs" target builds the javadoc
# "package" target builds lib + jar + javadoc + distribution
# --------------------------------------------
-TARGET=${1}
+
+PROGRAM=$0
+PROGRAM_NAME="`basename $PROGRAM`"
+PROGRAM_DIR="`dirname $PROGRAM`"
+JAR_DIR=.
+BUILDFILE=./build-oro.xml
+TARGET=$1
+
+cd "$PROGRAM_DIR"
+
#--------------------------------------------
# No need to edit anything past here
#--------------------------------------------
@@ -27,20 +36,19 @@
fi
if test -z "${TARGET}" ; then
-TARGET=jar
+ TARGET=jar
fi
-if test -f ${JAVA_HOME}/lib/tools.jar ; then
- CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
+if test -f "${JAVA_HOME}/lib/tools.jar" ; then
+ CLASSPATH="${CLASSPATH}:${JAVA_HOME}/lib/tools.jar"
fi
echo "Now building ${TARGET}..."
-CP=${CLASSPATH}:ant.jar:xml.jar
+CP="${CLASSPATH}:${JAR_DIR}/ant-1.3.jar:${JAR_DIR}/jaxp.jar:${JAR_DIR}/parser.jar"
-echo "Classpath: ${CP}"
+echo "CLASSPATH: ${CP}"
echo "JAVA_HOME: ${JAVA_HOME}"
-BUILDFILE=./build-oro.xml
-${JAVA_HOME}/bin/java -classpath ${CP} org.apache.tools.ant.Main -buildfile ${BUILDFILE} ${TARGET}
+"${JAVA_HOME}/bin/java" -classpath "$CP" org.apache.tools.ant.Main -buildfile "$BUILDFILE" "$TARGET"
1.11 +9 -13 jakarta-oro/build/build-oro.xml
Index: build-oro.xml
===================================================================
RCS file: /home/cvs/jakarta-oro/build/build-oro.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build-oro.xml 2001/05/09 18:58:54 1.10
+++ build-oro.xml 2001/05/16 04:58:09 1.11
@@ -1,11 +1,8 @@
<?xml version="1.0"?>
-<!-- $Id: build-oro.xml,v 1.10 2001/05/09 18:58:54 dfs Exp $ -->
+<!-- $Id: build-oro.xml,v 1.11 2001/05/16 04:58:09 dfs Exp $ -->
<project name="Jakarta-ORO" default="main" basedir=".">
-<!-- Initialize build properties. -->
-
-<target name="init">
<property name="Name" value="Jakarta-ORO"/>
<property name="year" value="2000"/>
<property name="version" value="2.0.2"/>
@@ -14,18 +11,17 @@
<property name="code.src" value="../src"/>
<property name="build.src" value="../src/java"/>
<property name="build.dest" value="../classes"/>
- <property name="javadoc.destdir" value="../doc/api"/>
+ <property name="javadoc.destdir" value="../docs/api"/>
<property name="final.name" value="${project}-${version}"/>
<property name="final.dir" value="../${final.name}/"/>
<property name="debug" value="off"/>
<property name="optimize" value="on"/>
<property name="deprecation" value="off"/>
<property name="ant.home" value="."/>
-</target>
<!-- prepare target. Creates build directory. -->
- <target name="prepare" depends="init">
+ <target name="prepare">
<mkdir dir="${build.dest}"/>
<!--
<chmod perm="+x" file="bin/antRun"/>
@@ -140,13 +136,13 @@
<!-- Makes an attempt to clean up a little. -->
<target name="clean">
- <deltree dir="${build.dest}"/>
- <deltree dir="${javadoc.destdir}"/>
- <deltree dir="${final.dir}"/>
+ <delete dir="${build.dest}"/>
+ <delete dir="${javadoc.destdir}"/>
+ <delete dir="${final.dir}"/>
<delete file="../${final.name}.jar"/>
- <delete file="../${project}-${version}.tar"/>
- <delete file="../${project}-${version}.tar.gz"/>
- <delete file="../${project}-${version}.zip"/>
+ <delete file="../${final.name}.tar"/>
+ <delete file="../${final.name}.tar.gz"/>
+ <delete file="../${final.name}.zip"/>
</target>
</project>
1.1 jakarta-oro/build/ant-1.3.jar
<<Binary file>>
1.1 jakarta-oro/build/jaxp.jar
<<Binary file>>
1.1 jakarta-oro/build/parser.jar
<<Binary file>>
Re: cvs commit: jakarta-oro/build ant-1.3.jar jaxp.jar parser.jar
build-oro.bat build-oro.sh build-oro.xml ant.jar xml.jar
Posted by Jon Stevens <jo...@latchkey.com>.
on 5/15/01 9:58 PM, "dfs@apache.org" <df...@apache.org> wrote:
> Modified: build build-oro.bat build-oro.sh build-oro.xml
> Added: build ant-1.3.jar jaxp.jar parser.jar
> Removed: build ant.jar xml.jar
I think that the current trend is to remove the .sh and .bat files. Require
people to install Ant. Rename the build-oro.xml file to just build.xml. You
might want to consider following this trend.
-jon
--
If you come from a Perl or PHP background, JSP is a way to take
your pain to new levels. --Anonymous
<http://jakarta.apache.org/velocity/ymtd/ymtd.html>