jon 00/11/22 17:04:51
Modified: build build-velocity.sh build-velocity.xml
Log:
made building the documentation work again
pdf stuff still doesn't though
Revision Changes Path
1.9 +7 -17 jakarta-velocity/build/build-velocity.sh
Index: build-velocity.sh
===================================================================
RCS file: /home/cvs/jakarta-velocity/build/build-velocity.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build-velocity.sh 2000/11/22 05:49:24 1.8
+++ build-velocity.sh 2000/11/23 01:04:50 1.9
@@ -5,15 +5,6 @@
#-------------------------------------------------------------------
-LIB=./lib
-
-# Libs needed for build.
-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
#--------------------------------------------
@@ -24,26 +15,25 @@
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
-if test -f ${JAVA_HOME}/lib/tools.jar ; then
- CLASSPATH="${CLASSPATH}:${JAVA_HOME}/lib/tools.jar"
-fi
+CLASSPATH=${CLASSPATH}:./lib/ant-1.2.jar
+CLASSPATH=${CLASSPATH}:./lib/ant-1.2-optional.jar
+CLASSPATH=${CLASSPATH}:./lib/xerces-1.2.1.jar
-CLASSPATH=${CLASSPATH}:${ANT}:${ANTOPTIONAL}:${XERCES}:${XALAN}
-CLASSPATH=${CLASSPATH}:${FOP}:${XSLT}
-
# convert the unix path to windows
if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
BUILDFILE=build-velocity.xml
-
-echo $CLASSPATH
${JAVA_HOME}/bin/java -classpath ${CLASSPATH} \
org.apache.tools.ant.Main \
1.16 +14 -8 jakarta-velocity/build/build-velocity.xml
Index: build-velocity.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity/build/build-velocity.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build-velocity.xml 2000/11/22 05:49:24 1.15
+++ build-velocity.xml 2000/11/23 01:04:50 1.16
@@ -79,9 +79,20 @@
</path>
<!-- =================================================================== -->
+ <!-- prints the environement -->
+ <!-- =================================================================== -->
+ <target name="env">
+ <echo message="build.compiler = ${build.compiler}"/>
+ <echo message="java.home = ${java.home}"/>
+ <echo message="user.home = ${user.home}"/>
+ <echo message="java.class.path = ${java.class.path}"/>
+ <echo message=""/>
+ </target>
+
+ <!-- =================================================================== -->
<!-- Prepares the build directory -->
<!-- =================================================================== -->
- <target name="prepare">
+ <target name="prepare" depends="env">
<filter token="year" value="${year}"/>
<filter token="version" value="${version}"/>
<filter token="date" value="${TODAY}"/>
@@ -205,18 +216,13 @@
<!-- =================================================================== -->
<!-- Make HTML version of Velocity documentation -->
<!-- =================================================================== -->
- <target name="docs">
+ <target name="docs" depends="prepare">
<java fork="yes" classname="${doc.generator}">
<arg value="targetDirectory=${velocity.docs}"/>
<arg value="${velocity.xdocs}/site-book.xml"/>
<arg value="${velocity.skin}"/>
- <classpath>
- <pathelement path="${classpath}"/>
- <pathelement location="${stylebook.jar}"/>
- <pathelement location="${xerces.jar}"/>
- <pathelement location="${xalan.jar}"/>
- </classpath>
+ <classpath refid="classpath"/>
</java>
</target>
