jon 00/11/21 21:49:25
Modified: build build-velocity.bat build-velocity.sh
build-velocity.xml
Log:
cleaned up for newer versions of Ant
i screwed up the PDF generation so it is commented out for now
Revision Changes Path
1.10 +11 -56 jakarta-velocity/build/build-velocity.bat
Index: build-velocity.bat
===================================================================
RCS file: /home/cvs/jakarta-velocity/build/build-velocity.bat,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build-velocity.bat 2000/10/30 00:02:22 1.9
+++ build-velocity.bat 2000/11/22 05:49:24 1.10
@@ -1,73 +1,24 @@
@echo off
-REM -----------------------------------------------------------
-REM The targets are the different build scripts.
-REM The default "jar" is suggested
-REM and does not require any external packages
-REM
-REM "compile" target builds Turbine core classes
-REM "clean" target removes bin directory
-REM "jar" target builds "core" + jar file
-REM "javadocs" target builds the javadocs
-REM -----------------------------------------------------------
-set TARGET=%1%
-REM set TARGET=javadocs
-REM set TARGET=compile
-REM set TARGET=clean
-REM set TARGET=jar
-
-REM -------------------------------------------------------------------
-REM Define the paths to each of the packages.
-REM -------------------------------------------------------------------
-set LIB=lib
-set ANT=%LIB%\ant.jar
-set ANTXML=%LIB%\xml.jar
-set XERCES=%LIB%\xerces-1.1.3.jar
-set SERVLET=%LIB%\servlet.jar
-set ORO=%LIB%\oro.jar
-
-set LOG=%LIB%\log.jar
-set JAVACLASS=%LIB%\JavaClass.jar
-
-set JUNIT=%LIB%\junit-3.2.jar
-
-set XALAN=%LIB%\xalan_1_1_D01.jar
-set FOP=%LIB%\fop.jar
-set W3C=%LIB%\w3c.jar
-set SB=%LIB%\stylebook-1.0-b2.jar
-
REM --------------------------------------------
REM No need to edit anything past here
REM --------------------------------------------
+set _BUILDFILE=%BUILDFILE%
set BUILDFILE=build-velocity.xml
-if "%TARGET%" == "" goto setdist
-goto final
-
-:setdist
-set TARGET=jar
-goto final
-
:final
-REM set JIKES to be non-null (eg set JIKES=Y) to use the jikes compiler -
-REM its a bit faster
-REM get it from here...
-REM http://oss.software.ibm.com/developerworks/opensource/jikes/project
-set JAVAC=classic
-if not "%JIKES%" == "" set JAVAC=jikes
+set _CLASSPATH=%CLASSPATH%
if "%JAVA_HOME%" == "" goto javahomeerror
if exist %JAVA_HOME%\lib\tools.jar set
CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
-
-echo Now building %TARGET%...
-
-set
CP=%CLASSPATH%;%TOOLS%;%ANT%;%ANTXML%;%XERCES%;%XALAN%;%SB%;%LOG%;%FOP%;%LIB%;%W3C%;%JAVACLASS%;%SERVLET%;%JUNIT%;%ORO%
-echo Classpath: %CP%
-echo JAVA_HOME: %JAVA_HOME%
+set CLASSPATH=%CLASSPATH%;.\lib\ant-1.2.jar;.\lib\ant-1.2-optional.jar
+set CLASSPATH=%CLASSPATH%;.\lib\xerces-1.2.1.jar
+set CLASSPATH=%CLASSPATH%;.\lib\Fop.class
+set CLASSPATH=%CLASSPATH%;.\lib\Xslt.class
-%JAVA_HOME%\bin\java.exe -classpath "%CP%" -DJAVAC=%JAVAC%
org.apache.tools.ant.Main -buildfile %BUILDFILE% %TARGET%
+%JAVA_HOME%\bin\java.exe org.apache.tools.ant.Main -buildfile %BUILDFILE% %1 %2 %3
%4 %5 %6 %7 %8 %9
goto end
@@ -78,3 +29,7 @@
echo "location of the Java Virtual Machine you want to use."
:end
+set BUILDFILE=%_BUILDFILE%
+set _BUILDFILE=
+set CLASSPATH=%_CLASSPATH%
+set _CLASSPATH=
1.8 +10 -31 jakarta-velocity/build/build-velocity.sh
Index: build-velocity.sh
===================================================================
RCS file: /home/cvs/jakarta-velocity/build/build-velocity.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build-velocity.sh 2000/10/17 05:53:36 1.7
+++ build-velocity.sh 2000/11/22 05:49:24 1.8
@@ -5,27 +5,14 @@
#-------------------------------------------------------------------
-LIB=lib
+LIB=./lib
# Libs needed for build.
-ANT=${LIB}/ant.jar
-ANTXML=${LIB}/xml.jar
-XERCES=${LIB}/xerces-1.1.3.jar
-SERVLET=${LIB}/servlet.jar
-ORO=${LIB}/oro.jar
-
-# Libs needed for runtime.
-LOG=${LIB}/log.jar
-JAVACLASS=${LIB}/JavaClass.jar
-
-# Lib needed for testing.
-JUNIT=${LIB}/junit-3.2.jar
-
-# Libs needed for docs.
-XALAN=${LIB}/xalan_1_1_D01.jar
-FOP=${LIB}/fop.jar
-W3C=${LIB}/w3c.jar
-SB=${LIB}/stylebook-1.0-b2.jar
+ANT=${LIB}/ant-1.2.jar
+ANTOPTIONAL=${LIB}/ant-1.2-optional.jar
+XERCES=${LIB}/xerces-1.2.1.jar
+FOP=${LIB}/Fop.class
+XSLT=${LIB}/Xslt.class
#--------------------------------------------
# No need to edit anything past here
@@ -46,9 +33,8 @@
CLASSPATH="${CLASSPATH}:${JAVA_HOME}/lib/tools.jar"
fi
-CLASSPATH=${CLASSPATH}:${ANT}:${ANTXML}:${XERCES}:${XALAN}
-CLASSPATH=${CLASSPATH}:${SB}:${LOG}:${FOP}:${LIB}:${W3C}:${JAVACLASS}:${SERVLET}:${JUNIT}
-CLASSPATH=${CLASSPATH}:${SERVLET}:${JUNIT}:${ORO}
+CLASSPATH=${CLASSPATH}:${ANT}:${ANTOPTIONAL}:${XERCES}:${XALAN}
+CLASSPATH=${CLASSPATH}:${FOP}:${XSLT}
# convert the unix path to windows
if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
@@ -57,15 +43,8 @@
BUILDFILE=build-velocity.xml
+echo $CLASSPATH
+
${JAVA_HOME}/bin/java -classpath ${CLASSPATH} \
org.apache.tools.ant.Main \
-buildfile ${BUILDFILE} "$@"
-
-
-
-
-
-
-
-
-
1.15 +92 -83 jakarta-velocity/build/build-velocity.xml
Index: build-velocity.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity/build/build-velocity.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build-velocity.xml 2000/11/16 02:18:20 1.14
+++ build-velocity.xml 2000/11/22 05:49:24 1.15
@@ -2,83 +2,90 @@
<!-- Build file for Velocity -->
-<project name="Velocity" default="compile" basedir=".">
+<project name="Velocity" default="prepare" basedir=".">
- <target name="init">
- <property name="Name" value="Velocity"/>
- <property name="version" value="0.4"/>
- <property name="project" value="velocity"/>
- <property name="build.compiler" value="classic"/>
-
- <property name="build.dir" value="../bin"/>
- <property name="build.src" value="${build.dir}/src"/>
- <property name="build.dest" value="${build.dir}/classes"/>
-
- <property name="src.java.dir" value="../src/java"/>
- <property name="javadoc.destdir" value="../docs/apidocs"/>
- <property name="final.name" value="${project}-${version}"/>
- <property name="dist.root" value="../dist"/>
- <property name="dist.dir" value="${dist.root}/${final.name}"/>
- <property name="year" value="1999-2000"/>
- <property name="ant.home" value="."/>
- <property name="debug" value="on"/>
- <property name="optimize" value="on"/>
- <property name="deprecation" value="on"/>
- <property name="log.jar" value="lib/log.jar"/>
- <property name="oro.jar" value="lib/oro.jar"/>
-
- <property name="velocity.docs" value="../docs"/>
- <property name="velocity.xdocs" value="../xdocs"/>
- <property name="velocity.skin" value="../xdocs/skin"/>
- <property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
-
- <property name="stylebook.jar" value="lib/stylebook-1.0-b2.jar"/>
- <property name="xerces.jar" value="lib/xerces-1.1.3.jar"/>
- <property name="xalan.jar" value="lib/xalan_1_1_D01.jar"/>
- <property name="junit.jar" value="lib/junit-3.2.jar"/>
-
- <!-- Forum demo build information -->
- <property name="demo.base" value="../examples/forumdemo"/>
- <property name="demo.dest" value="${demo.base}/WEB-INF/classes"/>
- <property name="demo.src" value="${demo.base}/WEB-INF/src"/>
-
- <!-- PDF generation using FOP -->
- <property name="xdocs.dir" value="../xdocs"/>
- <property name="allfiles.xml" value="velocity-doc.xml"/>
- <property name="outfile.fo" value="velocity.fo"/>
- <property name="outfile.pdf" value="../docs/velocity.pdf"/>
-
-
- <!-- JUnit Testbed -->
- <property name="velocity.test.runner" value="junit.textui.TestRunner"/>
-
- <property name="template.test"
- value="org.apache.velocity.test.TemplateTestCase"/>
-
- <property name="introspector.test"
- value="org.apache.velocity.test.IntrospectorTestCase"/>
-
- <property name="default.properties"
- value="org/apache/velocity/runtime/defaults/velocity.properties"/>
-
- <property name="default.test.properties"
- value="org/apache/velocity/test/defaults/velocity.properties"/>
-
- <property name="default.texen.properties"
- value="org/apache/velocity/texen/defaults/texen.properties"/>
+ <property name="Name" value="Velocity"/>
+ <property name="version" value="0.5"/>
+ <property name="project" value="velocity"/>
+ <property name="build.compiler" value="classic"/>
+
+ <property name="build.dir" value="../bin"/>
+ <property name="build.src" value="${build.dir}/src"/>
+ <property name="build.dest" value="${build.dir}/classes"/>
+
+ <property name="src.java.dir" value="../src/java"/>
+ <property name="javadoc.destdir" value="../docs/apidocs"/>
+ <property name="final.name" value="${project}-${version}"/>
+ <property name="dist.root" value="../dist"/>
+ <property name="dist.dir" value="${dist.root}/${final.name}"/>
+ <property name="year" value="2000"/>
+ <property name="ant.home" value="."/>
+ <property name="debug" value="on"/>
+ <property name="optimize" value="on"/>
+ <property name="deprecation" value="on"/>
+ <property name="log.jar" value="lib/log.jar"/>
+ <property name="oro.jar" value="lib/oro.jar"/>
+
+ <property name="velocity.docs" value="../docs"/>
+ <property name="velocity.xdocs" value="../xdocs"/>
+ <property name="velocity.skin" value="../xdocs/skin"/>
+ <property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
+
+ <property name="stylebook.jar" value="lib/stylebook-1.0-b2.jar"/>
+ <property name="xerces.jar" value="lib/xerces-1.1.3.jar"/>
+ <property name="xalan.jar" value="lib/xalan_1_1_D01.jar"/>
+ <property name="junit.jar" value="lib/junit-3.2.jar"/>
+
+ <!-- Forum demo build information -->
+ <property name="demo.base" value="../examples/forumdemo"/>
+ <property name="demo.dest" value="${demo.base}/WEB-INF/classes"/>
+ <property name="demo.src" value="${demo.base}/WEB-INF/src"/>
+
+ <!-- PDF generation using FOP -->
+ <property name="xdocs.dir" value="../xdocs"/>
+ <property name="allfiles.xml" value="velocity-doc.xml"/>
+ <property name="outfile.fo" value="velocity.fo"/>
+ <property name="outfile.pdf" value="../docs/velocity.pdf"/>
+
+
+ <!-- JUnit Testbed -->
+ <property name="velocity.test.runner" value="junit.textui.TestRunner"/>
+
+ <property name="template.test"
+ value="org.apache.velocity.test.TemplateTestCase"/>
+
+ <property name="introspector.test"
+ value="org.apache.velocity.test.IntrospectorTestCase"/>
+
+ <property name="default.properties"
+ value="org/apache/velocity/runtime/defaults/velocity.properties"/>
+
+ <property name="default.test.properties"
+ value="org/apache/velocity/test/defaults/velocity.properties"/>
+
+ <property name="default.texen.properties"
+ value="org/apache/velocity/texen/defaults/texen.properties"/>
+
+<!-- disabled for now == classpath issues
+ <taskdef name="fop" classname="Fop"/>
+ <taskdef name="xslt" classname="Xslt"/>
+ -->
+
+ <!-- Build classpath -->
+ <path id="classpath">
+ <fileset dir="./lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
- <taskdef name="fop" classname="Fop"/>
- <taskdef name="xslt" classname="Xslt"/>
-
+ <!-- =================================================================== -->
+ <!-- Prepares the build directory -->
+ <!-- =================================================================== -->
+ <target name="prepare">
<filter token="year" value="${year}"/>
<filter token="version" value="${version}"/>
<filter token="date" value="${TODAY}"/>
- </target>
- <!-- =================================================================== -->
- <!-- Prepares the build directory -->
- <!-- =================================================================== -->
- <target name="prepare" depends="init">
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.dest}"/>
<mkdir dir="${build.src}"/>
@@ -96,7 +103,10 @@
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
- optimize="${optimize}"/>
+ optimize="${optimize}">
+
+ <classpath refid="classpath"/>
+ </javac>
<copy todir="${build.dest}/org/apache/velocity">
<fileset dir="${src.java.dir}/org/apache/velocity"
@@ -121,13 +131,12 @@
<unzip src="${log.jar}" dest="${build.dest}"/>
<unzip src="${oro.jar}" dest="${build.dest}"/>
-
+
+ <delete dir="${build.dest}/meta-inf"/>
+
<jar jarfile="${build.dir}/${project}-${version}.jar"
basedir="${build.dest}"
excludes="**/package.html"/>
- <!-- HELP: Ant does not like my use of the jar task's manifest
- attribute. It reports "basedir does not exist".
- manifest="{build.dest}/META-INF/MANIFEST.MF"/> -->
</target>
<!-- =================================================================== -->
@@ -189,14 +198,14 @@
<!-- =================================================================== -->
<!-- Cleans up the build directory -->
<!-- =================================================================== -->
- <target name="clean" depends="init">
+ <target name="clean">
<delete dir="${build.dir}"/>
</target>
<!-- =================================================================== -->
<!-- Make HTML version of Velocity documentation -->
<!-- =================================================================== -->
- <target name="docs" depends="init">
+ <target name="docs">
<java fork="yes" classname="${doc.generator}">
<arg value="targetDirectory=${velocity.docs}"/>
@@ -215,7 +224,7 @@
<!-- =================================================================== -->
<!-- Make PDF version of Velocity documentation -->
<!-- =================================================================== -->
- <target name="pdf" depends="init">
+<!-- <target name="pdf">
<xslt infile="../xdocs/site-book.xml" xsltfile="xsl/xml2xml.xsl"
outfile="${allfiles.xml}" smart="yes"/>
@@ -227,11 +236,11 @@
<delete file="${allfiles.xml}"/>
<delete file="${outfile.fo}"/>
</target>
-
+-->
<!-- =================================================================== -->
<!-- JUnit Tests for Velocity -->
<!-- =================================================================== -->
- <target name="test" depends="init">
+ <target name="test">
<echo message="Running JUnit template tests for Velocity ..."/>
@@ -246,7 +255,7 @@
</target>
- <target name="test-introspector" depends="init">
+ <target name="test-introspector">
<echo message="Running JUnit Introspector tests for Velocity ..."/>
@@ -290,7 +299,7 @@
</target>
<!-- Delete the demo files for re-build -->
- <target name="cleandemo" depends="init">
+ <target name="cleandemo">
<delete dir="${demo.dest}/org"/>
<delete file="${build.dir}/forumdemo.war"/>
</target>
