You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/06/14 17:14:28 UTC
cvs commit: jakarta-slide build.xml build.properties.sample
remm 01/06/14 08:14:28
Modified: . build.xml build.properties.sample
Log:
- Modifications to make it possible to build with build.sysclasspath=ignore.
- Updated the sample file with the latest dependencies.
- Added some trace to try to debug the Gump build failure.
Revision Changes Path
1.94 +25 -3 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- build.xml 2001/06/14 00:41:10 1.93
+++ build.xml 2001/06/14 15:14:24 1.94
@@ -45,6 +45,8 @@
<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="ant.home" value="../jakarta-ant/dist"/>
+ <property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
<property name="junit.jar" value="./lib/junit.jar"/>
<property name="jndi.jar" value="./lib/jndi.jar"/>
<property name="jta.jar" value="./lib/jta.jar"/>
@@ -124,6 +126,8 @@
</path>
<path id="stores.classpath">
+ <pathelement location="${xmlapi.jar}"/>
+ <pathelement location="${jaxp.jar}"/>
<pathelement location="${jta.jar}"/>
<pathelement location="${slide.build}/classes"/>
</path>
@@ -151,6 +155,7 @@
<path id="webdavclient.classpath">
<pathelement location="${jaxp.jar}"/>
<pathelement location="${xmlapi.jar}"/>
+ <pathelement location="${ant.jar}"/>
<pathelement location="${commons-httpclient.jar}"/>
<pathelement location="${slide.build}/classes"/>
</path>
@@ -161,6 +166,7 @@
<!-- =================================================================== -->
<path id="test.classpath">
<pathelement location="${jaxp.jar}"/>
+ <pathelement location="${xmlapi.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${jdom.jar}"/>
<pathelement location="${jta.jar}"/>
@@ -273,6 +279,15 @@
<available property="jndi.present"
classname="javax.naming.Context"
classpath="${jndi.jar}" />
+ <available property="ant.present"
+ classname="org.apache.tools.ant.Task"
+ classpath="${ant.jar}" />
+ <available property="naming.present"
+ classname="org.apache.naming.NamingEntry"
+ classpath="${naming.jar}" />
+ <available property="resources.present"
+ classname="org.apache.naming.resources.Resource"
+ classpath="${resources.jar}" />
<echo message="--- Build environment for ${final.name} ---" />
@@ -293,12 +308,15 @@
<echo message="jaxp11.present (optional) = ${jaxp11.present}" />
<echo message="jmx.present (optional) = ${jmx.present}" />
+ <echo message="ant.present (optional) = ${ant.present}" />
<echo message="junit.present (optional) = ${junit.present}" />
<echo message="catalina.present (optional) = ${catalina.present}" />
<echo message="xsl.present (optional) = ${xsl.present}" />
<echo message="log4j.present (optional) = ${log4j.present}" />
<echo message="jndi.present (optional) = ${jndi.present}" />
<echo message="struts.present (optional) = ${struts.present}" />
+ <echo message="naming.present (optional) = ${naming.present}" />
+ <echo message="resources.present (optional) = ${resources.present}" />
<echo message="--- Property values" />
@@ -315,6 +333,9 @@
<echo message="junit.jar=${junit.jar}" />
<echo message="log4j.jar=${log4j.jar}" />
<echo message="jta.jar=${jta.jar}" />
+ <echo message="catalina.jar=${catalina.jar}" />
+ <echo message="resources.jar=${resources.jar}" />
+ <echo message="naming.jar=${naming.jar}" />
<echo message="commons-httpclient.jar=${commons-httpclient.jar}" />
<echo message="tomcat.build=${tomcat.build}" />
<echo message="slide.build=${slide.build}" />
@@ -488,6 +509,7 @@
optimize="${compile.optimize}"
excludes="**/CVS/**,**/package.html">
<classpath refid="webdavclient.classpath"/>
+ <exclude name="**/ant/**" unless="ant.present" />
</javac>
<copy todir="${webdavclient.build}/bin">
@@ -525,7 +547,7 @@
<!-- =================================================================== -->
<!-- Javadoc of the WebDAV client -->
<!-- =================================================================== -->
- <target name="webdav-client-javadoc">
+ <target name="webdav-client-javadoc" unless="skip.javadoc">
<property name="copyright" value="" />
<javadoc sourcepath="src/webdav/client/src"
@@ -645,7 +667,7 @@
<!-- =================================================================== -->
<!-- Build the Slide JavaDoc -->
<!-- =================================================================== -->
- <target name="javadoc" depends="prepare">
+ <target name="javadoc" depends="prepare" unless="skip.javadoc">
<property name="copyright" value="" />
<javadoc sourcepath="src/share" destdir="${slide.build}/doc/javadoc"
doctitle="Slide JavaDoc" package="true" noindex="true"
@@ -796,7 +818,7 @@
includes="**"
excludes="**/CVS/**">
<classpath refid="wrappers.classpath"/>
- <exclude name="**/SlideRealm*.*" unless="catalina.present" />
+ <exclude name="**/catalina/**" unless="catalina.present" />
<exclude name="**/log4j/**" unless="log4j.present" />
<exclude name="**/jndi/**" unless="jndi.present" />
</javac>
1.5 +37 -13 jakarta-slide/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-slide/build.properties.sample,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties.sample 2001/06/13 04:31:36 1.4
+++ build.properties.sample 2001/06/14 15:14:25 1.5
@@ -6,7 +6,7 @@
# Make any changes you need, and rename this file to
# "build.properties"
#
-# $Id: build.properties.sample,v 1.4 2001/06/13 04:31:36 remm Exp $
+# $Id: build.properties.sample,v 1.5 2001/06/14 15:14:25 remm Exp $
# -------------------------------------------------------------------
@@ -17,38 +17,62 @@
# Uncomment the following line to set user authentication on by default
#authenticate
+# Tell Ant to ignore the system's classpath (dramatically improves the
+# probability to get correctly packaged binaries if the build is
+# successfull)
+#build.sysclasspath=ignore
+# Uncomment to avoid generating JavaDocs (faster builds)
+#skip.javadoc
+
+
# -------------------------------------------------------------------
# EXTERNAL DEPENDENCIES
# -------------------------------------------------------------------
-# junit.jar -- JUnit classes (http://junit.org)
-junit.jar=/java/junit/junit.jar
+# The path that is base for the rest of the paths in this file.
+base.path=/jars
-# jaxp.jar -- JAXP 1.1 (http://java.sun.com/xml/)
-jaxp.jar=/java/jaxp/jaxp.jar
+# [REQUIRED]
-# xmlapi.jar -- JAXP 1.1 (http://java.sun.com/xml/)
-xmlapi.jar=/java/jaxp/crimson.jar
+# The directory containing your binary distribution of JAXP and its
+# associated declarations. You can customize the versions of JAXP used
+# for Catalina and Jasper below. If you are using JAXP/1.0, replace
+# "crimson.jar" with "parser.jar"
+jaxp.home=${base.path}/jaxp
+jaxp.parser.jar=crimson.jar
-# xalan.jar -- JAXP 1.1 (http://java.sun.com/xml/)
-xalan.jar=/java/jaxp/xalan.jar
+# junit.jar -- JUnit classes (http://junit.org)
+junit.jar=${base.path}/junit.jar
# The directory containing your binary distribution of the Servlet 2.2
# and JSP 1.2 API classes
servletapi.home=${base.path}/servlet22
# commons-httpclient.jar -- the HTTP client package from the Commons
-commons-httpclient.jar=${basedir}/../jakarta-commons/httpclient/dist/commons-httpclient.jar
+commons-httpclient.jar=${basedir}/commons-httpclient.jar
# jta.jar -- Java Transaction API 1.0.1 (http://java.sun.com/products/jta/)
-jta.jar=/java/jta/jta.jar
+jta.jar=${base.path}/jta.jar
# jdom.jar -- JDOM (http://www.jdom.org/)
-jdom.jar=/java/jdom/jdom.jar
+jdom.jar=${base.path}/jdom.jar
+# [OPTIONAL]
+
+# The directory containing your binary distribution of the Java Naming and
+# Directory Interface (JNDI), version 1.2.1 or later. (You must also add
+# "ldap.jar" into the ${jndi.home}/lib directory if you want to build and
+# use JNDIRealm.)
+jndi.home=${base.path}/jndi
+
# log4j.jar -- log4j (http://jakarta.apache.org/log4j/)
-log4j.jar=/java/log4j/log4j.jar
+log4j.jar=${base.path}/log4j.jar
# Struts home directory
struts.home=${base.path}/struts
+
+# The directory containing your binary distribution of the Java Management
+# Extensions (JMX) Reference Implementation, version 1.0 or later
+jmx.home=${base.path}/jmx
+