remm 01/02/06 15:25:31
Modified: . build.xml build.sh build.bat
Log:
- Yet another overhaul of the build system.
- Will now display the environment variables and properties which are in use,
to help debug problems.
Revision Changes Path
1.70 +70 -18 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- build.xml 2001/02/06 17:29:50 1.69
+++ build.xml 2001/02/06 23:25:28 1.70
@@ -15,7 +15,10 @@
<property name="catalina.dist" value="../jakarta-tomcat-4.0/dist" />
<property name="servlet.jar"
value="../jakarta-servletapi/lib/servlet.jar" />
<property name="jaxp.home" value="../jaxp"/>
+ <property name="xmlapi.jar" value="${jaxp.home}/crimson.jar"/>
+ <property name="jaxp.jar" value="${jaxp.home}/jaxp.jar"/>
<property name="jmx.home" value="../jmx"/>
+ <property name="jmx.jar" value="${jmx.home}/lib/jmxri.jar"/>
<property name="junit.jar" value="./lib/junit.jar"/>
<property name="jta.jar" value="./lib/jta.jar"/>
<property name="tomcat.build" value="../jakarta-tomcat-4.0/build" />
@@ -73,9 +76,63 @@
<!-- =================================================================== -->
+ <!-- Setenv -->
+ <!-- =================================================================== -->
+ <target name="setenv">
+
+ <available property="jta.present"
+ classname="javax.transaction.UserTransaction"
+ classpath="${jta.jar}" />
+ <available property="jmx.present"
+ classname="javax.management.MBeanServer"
+ classpath="${jmx.jar}" />
+ <available property="avalon.present"
+ classname="org.apache.avalon.blocks.Block" />
+ <available property="junit.present"
+ classname="junit.framework.TestCase"
+ classpath="${junit.jar}" />
+ <available property="catalina.present"
+ classname="org.apache.catalina.Container"
+ classpath="${catalina.build}/classes" />
+ <available property="xsl.present"
+ classname="org.apache.tools.ant.taskdefs.optional.XalanLiaison" />
+
+ <echo message="--- Build environment for ${final.name} ---" />
+ <echo message="--- Flags (Note: If the {property name} is displayed, then the
component is not present)" />
+ <echo message="jta.present=${jta.present}" />
+ <echo message="jmx.present=${jmx.present}" />
+ <echo message="avalon.present=${avalon.present}" />
+ <echo message="junit.present=${junit.present}" />
+ <echo message="catalina.present=${catalina.present}" />
+ <echo message="xsl.present=${xsl.present}" />
+ <echo message="--- Property values" />
+ <echo message="ant.home=${ant.home}" />
+ <echo message="catalina.build=${catalina.build}" />
+ <echo message="catalina.dist=${catalina.dist}" />
+ <echo message="servlet.jar=${servlet.jar}" />
+ <echo message="jaxp.home=${jaxp.home}" />
+ <echo message="jaxp.jar=${jaxp.jar}" />
+ <echo message="xmlapi.jar=${xmlapi.jar}" />
+ <echo message="jmx.home=${jmx.home}" />
+ <echo message="jmx.jar=${jmx.jar}" />
+ <echo message="junit.jar=${junit.jar}" />
+ <echo message="jta.jar=${jta.jar}" />
+ <echo message="tomcat.build=${tomcat.build}" />
+ <echo message="slide.build=${slide.build}" />
+ <echo message="slide.dist=${slide.dist}" />
+ <echo message="webapp.dist=${webapp.dist}" />
+ <echo message="slide.release=${slide.release}" />
+ <echo message="slide.archive=${slide.archive}" />
+ <echo message="webdavclient.build=${webdavclient.build}" />
+ <echo message="webdavclient.dist=${webdavclient.dist}" />
+
+ </target>
+
+
+ <!-- =================================================================== -->
<!-- Prepare -->
<!-- =================================================================== -->
- <target name="prepare">
+ <target name="prepare" depends="setenv">
<mkdir dir="${slide.build}"/>
<mkdir dir="${slide.build}/classes"/>
@@ -87,18 +144,6 @@
<mkdir dir="${slide.build}/doc/samples"/>
<mkdir dir="${slide.build}/doc/javadoc"/>
- <available property="jmx.present"
- classname="javax.management.MBeanServer" />
- <available property="avalon.present"
- classname="org.apache.avalon.blocks.Block" />
- <available property="junit.present"
- classname="junit.framework.TestCase" />
- <available property="catalina.present"
- classname="org.apache.catalina.Container"
- classpath="${catalina.build}/classes" />
- <available property="xsl.present"
- classname="org.apache.tools.ant.taskdefs.optional.XalanLiaison" />
-
</target>
@@ -115,7 +160,8 @@
<echo message="Building Slide Core API" />
<javac srcdir="src/share" destdir="${slide.build}/classes"
- debug="on" deprecation="on" classpath="${jta.jar}"
+ debug="on" deprecation="on"
+ classpath="${jta.jar}:${jmx.jar}"
excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
<exclude name="**/Slide.java" unless="jmx.present" />
<exclude name="**/SlideMBean.java" unless="jmx.present" />
@@ -190,7 +236,7 @@
<echo message="Building Slide Core API" />
<javac srcdir="src/share" destdir="${slide.build}/classes"
- debug="off" deprecation="off" classpath="${jta.jar}"
+ debug="off" deprecation="off" classpath="${jta.jar}:${jmx.jar}"
excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
<exclude name="**/Slide.java" unless="jmx.present" />
<exclude name="**/SlideMBean.java" unless="jmx.present" />
@@ -253,6 +299,7 @@
<javac srcdir="src/webdav/client/src"
destdir="${webdavclient.build}/classes"
debug="on" deprecation="on"
+ classpath="${jaxp.jar}"
excludes="**/CVS/**,**/package.html" />
<copy todir="${webdavclient.build}/bin">
<fileset dir="src/webdav/client/bin">
@@ -269,6 +316,7 @@
<target name="webdav-client-no-debug" depends="webdav-client-prepare">
<javac srcdir="src/webdav/client/src"
destdir="${webdavclient.build}/classes"
+ classpath="${jaxp.jar}"
debug="off" deprecation="off"
excludes="**/CVS/**,**/package.html">
<exclude name="**/tests/**" unless="junit.present" />
@@ -317,6 +365,7 @@
<property name="copyright" value="" />
<javadoc sourcepath="src/webdav/client/src"
destdir="${webdavclient.build}/doc/javadoc"
+ classpath="${jaxp.jar}:${xmlapi.jar}"
doctitle="Slide WebDAV Client JavaDoc" package="true"
noindex="false" author="true"
packagenames="org.apache.webdav.lib.*" />
@@ -371,7 +420,7 @@
<target name="examples" depends="main">
<javac srcdir="src/examples" destdir="${slide.build}/examples"
debug="on" deprecation="on" excludes="**/CVS/**"
- classpath="${slide.build}/classes" />
+ classpath="${slide.build}/classes:${jta.jar}" />
<copy todir="${slide.build}/examples">
<fileset dir="src/examples">
<exclude name="**/CVS/**" />
@@ -387,7 +436,7 @@
if="junit.present">
<javac srcdir="src/tests" destdir="${slide.build}/tests"
debug="on" deprecation="on" excludes="**/CVS/**"
- classpath="${slide.build}/classes:${webdavclient.build}/classes" />
+
classpath="${slide.build}/classes:${webdavclient.build}/classes:${jta.jar}:${junit.jar}"
/>
<copy todir="${slide.build}/tests">
<fileset dir="src/tests">
<exclude name="**/CVS/**" />
@@ -417,6 +466,7 @@
<target name="javadoc" depends="prepare">
<property name="copyright" value="" />
<javadoc sourcepath="src/share" destdir="${slide.build}/doc/javadoc"
+ classpath="${jta.jar}:${jaxp.jar}:${xmlapi.jar}:${jmx.jar}"
doctitle="Slide JavaDoc" package="true" noindex="true"
author="true" packagenames="org.*" />
</target>
@@ -516,6 +566,8 @@
<copy todir="${slide.dist}/lib">
<fileset dir="${slide.build}/lib" />
</copy>
+ <copy todir="${slide.dist}/lib" file="${jta.jar}" />
+ <copy todir="${slide.dist}/lib" file="${junit.jar}" />
</target>
@@ -552,7 +604,7 @@
debug="off" deprecation="off"
includes="**"
excludes="**/CVS/**"
- classpath="${slide.build}/classes:${catalina.build}/classes">
+ classpath="${slide.build}/classes:${catalina.build}/classes:${jta.jar}">
<exclude name="**/SlideRealm*.*" unless="catalina.present" />
</javac>
1.9 +8 -3 jakarta-slide/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-slide/build.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.sh 2001/01/28 16:58:44 1.8
+++ build.sh 2001/02/06 23:25:28 1.9
@@ -1,6 +1,6 @@
#! /bin/sh
-# $Id: build.sh,v 1.8 2001/01/28 16:58:44 remm Exp $
+# $Id: build.sh,v 1.9 2001/02/06 23:25:28 remm Exp $
BUILDFILE=build.xml
@@ -23,7 +23,7 @@
LOCALCLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
-LOCALCLASSPATH=`echo lib/*.jar | tr ' '
':'`:$JAVA_HOME/lib/tools.jar:$LOCALCLASSPATH:${ANT_HOME}/lib/ant.jar
+LOCALCLASSPATH=`echo lib/*.jar | tr ' '
':'`:$JAVA_HOME/lib/tools.jar:$LOCALCLASSPATH:$ANT_HOME/lib/ant.jar:$ANT_HOME/lib/optional.jar:$JAXP_HOME/crimson.jar:$JAXP_HOME/jaxp.jar:$JAXP_HOME/xalan.jar
# convert the unix path to windows
@@ -32,4 +32,9 @@
fi
${JAVA_HOME}/bin/java -classpath ${LOCALCLASSPATH} org.apache.tools.ant.Main \
- -buildfile ${BUILDFILE} "$@"
+ -buildfile ${BUILDFILE} \
+ -Djaxp.home=$JAXP_HOME \
+ -Dservlet.jar=$SERVLETAPI_HOME/lib/servlet.jar \
+ -Dant.home=$ANT_HOME \
+ -Djmx.home=$JMX_HOME \
+ "$@"
1.9 +8 -3 jakarta-slide/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-slide/build.bat,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.bat 2001/01/21 21:29:20 1.8
+++ build.bat 2001/02/06 23:25:29 1.9
@@ -10,21 +10,24 @@
set _SERVLETAPIHOME=%SERVLETAPI_HOME%
if "%SERVLETAPI_HOME%" == "" set SERVLETAPI_HOME=..\jakarta-servletapi
+set _JMX_HOME=%JMX_HOME%
+if "%JMX_HOME%" == "" set JMX_HOME=..\jmx
+
if "%CLASSPATH%" == "" goto noclasspath
rem else
set _CLASSPATH=%CLASSPATH%
-set
CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\optional.jar;%JAVA_HOME%\lib\tools.jar;%SERVLETAPI_HOME%\lib\servlet.jar;%JAXP_HOME%\crimson.jar;%JAXP_HOME%\jaxp.jar;%JAXP_HOME%\xalan.jar;.\lib\junit.jar
+set
CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\optional.jar;%JAVA_HOME%\lib\tools.jar;%JAXP_HOME%\crimson.jar;%JAXP_HOME%\jaxp.jar;%JAXP_HOME%\xalan.jar
goto next
:noclasspath
set _CLASSPATH=
-set
CLASSPATH=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\optional.jar;%JAVA_HOME%\lib\tools.jar;%SERVLETAPI_HOME%\lib\servlet.jar;%JAXP_HOME%\crimson.jar;%JAXP_HOME%\jaxp.jar;%JAXP_HOME%\xalan.jar;.\lib\junit.jar
+set
CLASSPATH=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\optional.jar;%JAVA_HOME%\lib\tools.jar;%JAXP_HOME%\crimson.jar;%JAXP_HOME%\jaxp.jar;%JAXP_HOME%\xalan.jar
goto next
:next
-%JAVA_HOME%\bin\java %ANT_OPTS% org.apache.tools.ant.Main -Djaxp.home=%JAXP_HOME%
%1 %2 %3 %4 %5 %6 %7 %8 %9
+%JAVA_HOME%\bin\java %ANT_OPTS% org.apache.tools.ant.Main
-Djaxp.jar=%JAXP_HOME%\jaxp.jar -Djaxp.home=%JAXP_HOME%
-Dservlet.jar=%SERVLETAPI_HOME%\lib\servlet.jar -Dant.home=%ANT_HOME%
-Djmx.jar=%JMX_HOME%\lib\jmxri.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
:clean
@@ -35,5 +38,7 @@
set _SERVLETAPIHOME=
set JAXP_HOME=%_JAXP_HOME%
set _JAXP_HOME=
+set JMX_HOME=%_JMX_HOME%
+set _JMX_HOME=
set ANT_HOME=%_ANTHOME%
set _ANTHOME=
