ceki 01/04/18 01:21:17
Modified: build build.xml
build/lib ant.jar
Added: . build.bat build.sh
Removed: build build.bat build.sh
Log:
abondoned trying to make build/build.sh (or .bat) to work from that directory.
Moved these files to LOG4J_HOME/build.sh and LOG4J_HOME/build.bat
ant.jar is now version 1.3
Revision Changes Path
1.1 jakarta-log4j/build.bat
Index: build.bat
===================================================================
@echo off
REM --------------------------------------------
REM No need to edit anything past here
REM --------------------------------------------
set _BUILDFILE=%BUILDFILE%
set BUILDFILE=build\build.xml
:final
set _CLASSPATH=%CLASSPATH%
if "%JAVA_HOME%" == "" goto javahomeerror
if exist %JAVA_HOME%\lib\tools.jar set
CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
set CLASSPATH=%CLASSPATH%;build\lib\ant.jar;
set CLASSPATH=%CLASSPATH%;build\lib\jaxp.jar;
set CLASSPATH=%CLASSPATH%;build\lib\parser.jar;
%JAVA_HOME%\bin\java.exe org.apache.tools.ant.Main -buildfile %BUILDFILE% %1 %2 %3
%4 %5 %6 %7 %8 %9
goto end
REM -----------ERROR-------------
:javahomeerror
echo "ERROR: JAVA_HOME not found in your environment."
echo "Please, set the JAVA_HOME variable in your environment to match the"
echo "location of the Java Virtual Machine you want to use."
:end
set BUILDFILE=%_BUILDFILE%
set _BUILDFILE=
set CLASSPATH=%_CLASSPATH%
set _CLASSPATH=
1.1 jakarta-log4j/build.sh
Index: build.sh
===================================================================
#!/bin/sh
#--------------------------------------------
# No need to edit anything past here
#--------------------------------------------
if test -z "${JAVA_HOME}" ; then
echo "ERROR: JAVA_HOME not found in your environment."
echo "Please, set the JAVA_HOME variable in your environment to match the"
echo "location of the Java Virtual Machine you want to use."
exit
fi
if test -f ${JAVA_HOME}/lib/tools.jar ; then
CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
fi
# convert the existing path to unix
if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
ANT_JAR='build/lib/ant.jar'
JAXP_JAR='build/lib/jaxp.jar'
PARSER_JAR='build/lib/parser.jar'
CLASSPATH=${CLASSPATH}:${ANT_JAR}
CLASSPATH=${CLASSPATH}:${JAXP_JAR}
CLASSPATH=${CLASSPATH}:${PARSER_JAR}
# convert the unix path to windows
if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
BUILDFILE=build/build.xml
${JAVA_HOME}/bin/java -classpath ${CLASSPATH} org.apache.tools.ant.Main \
-buildfile ${BUILDFILE} "$@"
1.20 +38 -36 jakarta-log4j/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 2001/04/17 22:32:13 1.19
+++ build.xml 2001/04/18 08:21:15 1.20
@@ -7,36 +7,34 @@
<!-- NOTE: all directories are relative to jakarta-log4j/ -->
<!-- the parent of build/ -->
<!-- ================================================================= -->
-<project name="log4j" default="usage" basedir="." >
+<project name="log4j" default="usage" basedir=".." >
-
-
<property name="version" value="1.1b2"/>
<!-- The base directory relative to which most targets are built -->
- <property name="base" value=".."/>
+ <property name="base" value="."/>
<!-- The directory where source files are stored. -->
- <property name="java.source.dir" value="${base}/src/java/"/>
+ <property name="java.source.dir" value="src/java/"/>
<!-- The directory where the package-list file is found, ./ or -->
<!-- build/ -->
- <property name="packaging.dir" value="."/>
+ <property name="packaging.dir" value="build"/>
<!-- Destination for compiled files -->
- <property name="javac.dest" value="${base}/dist/classes"/>
+ <property name="javac.dest" value="dist/classes"/>
<!-- Destination for generated jar files -->
- <property name="jar.dest" value="${base}/dist/lib"/>
+ <property name="jar.dest" value="dist/lib"/>
<!-- Destination for documentation files generated or not -->
- <property name="docs" value="${base}/docs"/>
+ <property name="docs" value="docs"/>
<!-- Destination for javadoc generated files -->
- <property name="javadoc.dest" value="${base}/docs/api"/>
+ <property name="javadoc.dest" value="docs/api"/>
<!-- Icons source directory. -->
- <property name="icons.source" value="${base}/icons"/>
+ <property name="icons.source" value="icons"/>
<!-- The stem where most log4j source code is located. -->
<property name="stem" value="org/apache/log4j"/>
@@ -45,13 +43,13 @@
<property name="BSTEM" value="${java.source.dir}/${stem}"/>
<!-- Original manifest.mf file before filtering. -->
- <property name="manifest.src" value="${base}/build/manifest.mf"/>
+ <property name="manifest.src" value="build/manifest.mf"/>
<!-- Directory where release images go. -->
- <property name="dist.images" value="${base}/dist/images"/>
+ <property name="dist.images" value="dist/images"/>
<!-- Directory for temporary files. -->
- <property name="dist.tmp" value="${base}/dist/tmp"/>
+ <property name="dist.tmp" value="dist/tmp"/>
<target name="usage">
@@ -333,31 +331,35 @@
<!-- ================================================================= -->
<!-- Build a complete distribution. Results go to ${dist.images} -->
<!-- ================================================================= -->
- <target name="dist" depends="init, clean, jar">
+ <target name="dist" depends="init">
<delete verbose="true">
<fileset dir=".">
- <patternset includes="**/*.bak,
- ${BSTEM}/**/temp*,
- ${BSTEM}/performance/test,
- ${BSTEM}test/current.*,
- ${BSTEM}/examples/test,
- ${BSTEM}/test/logging.*,
- ${BSTEM}/test/log4j.properties,
- {$BSTEM}/test/socket.lcf,
- ${BSTEM}/test/file,${BSTEM}/test/output.*,
- ${BSTEM}/nt/EventLogCategories.dbg,
- ${BSTEM}/nt/EventLogCategories.h,
- ${BSTEM}/nt/EventLogCategories.rc,
- ${BSTEM}/nt/EventLogCategories.RES,
- ${BSTEM}/nt/MSG00001.bin,
- ${BSTEM}/nt/NTEventLogAppender.lib,
- ${BSTEM}/nt/NTEventLogAppender.exp,
- ${BSTEM}/nt/vc50.idb,
- ${BSTEM}/net/test/loop.log,
- ${BSTEM}/net/test/loop.log.1,
- ${jar.dest}/manifest.mf,
- ${javac.dest}/*.class"/>
+ <patternset>
+ <include name="**/*.bak"/>
+ <include name="${BSTEM}/**/temp*"/>
+ <include name="${BSTEM}/performance/test"/>
+ <include name="${BSTEM}/test/current.*"/>
+ <include name="${BSTEM}/test/current.*"/>
+ <include name="${BSTEM}/examples/test"/>
+ <include name="${BSTEM}/test/logging.*"/>
+ <include name="${BSTEM}/test/log4j.properties"/>
+ <include name="{$BSTEM}/test/socket.lcf"/>
+ <include name="${BSTEM}/test/file"/>
+ <include name="${BSTEM}/test/output.*"/>
+ <include name="${BSTEM}/nt/EventLogCategories.dbg"/>
+ <include name="${BSTEM}/nt/EventLogCategories.h"/>
+ <include name="${BSTEM}/nt/EventLogCategories.rc"/>
+ <include name="${BSTEM}/nt/EventLogCategories.RES"/>
+ <include name="${BSTEM}/nt/MSG00001.bin"/>
+ <include name="${BSTEM}/nt/NTEventLogAppender.lib"/>
+ <include name="${BSTEM}/nt/NTEventLogAppender.exp"/>
+ <include name="${BSTEM}/nt/vc50.idb"/>
+ <include name="${BSTEM}/net/test/loop.log"/>
+ <include name="${BSTEM}/net/test/loop.log.1"/>
+ <include name="${jar.dest}/manifest.mf"/>
+ <include name="${javac.dest}/*.class"/>
+ </patternset>
</fileset>
</delete>
1.2 +220 -220 jakarta-log4j/build/lib/ant.jar
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
