remm 01/02/15 09:48:22
Modified: . build.xml
Log:
- Create a set of utils which are shared between the three components of Slide
to avoid having a version of the file in multiple spots in the repository.
- Update build script.
- Note : Although there may be a lot of commits, the impact at the API level
is zero (except of course if you were using one of the util files which have
just been moved, in which case you just need to update the name of the
class in the imports).
Revision Changes Path
1.74 +31 -8 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- build.xml 2001/02/13 20:45:48 1.73
+++ build.xml 2001/02/15 17:48:16 1.74
@@ -180,9 +180,24 @@
<!-- =================================================================== -->
+ <!-- Build Utils -->
+ <!-- =================================================================== -->
+ <target name="util" depends="prepare">
+
+ <echo message="Building Utils" />
+ <javac srcdir="src/util" destdir="${slide.build}/classes"
+ debug="off" deprecation="off"
+ classpath="${xmlapi.jar}"
+ excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
+ </javac>
+
+ </target>
+
+
+ <!-- =================================================================== -->
<!-- Build Slide -->
<!-- =================================================================== -->
- <target name="main" depends="prepare">
+ <target name="main" depends="util">
<echo message="Building Slide Core API" />
<javac srcdir="src/share" destdir="${slide.build}/classes"
@@ -258,7 +273,7 @@
<!-- =================================================================== -->
<!-- Build Slide, without debug -->
<!-- =================================================================== -->
- <target name="no-debug" depends="prepare">
+ <target name="no-debug" depends="util">
<echo message="Building Slide Core API" />
<javac srcdir="src/share" destdir="${slide.build}/classes"
@@ -308,13 +323,21 @@
<!-- =================================================================== -->
<!-- Prepare WebDAV client -->
<!-- =================================================================== -->
- <target name="webdav-client-prepare">
+ <target name="webdav-client-prepare" depends="util">
+
<mkdir dir="${webdavclient.build}" />
<mkdir dir="${webdavclient.build}/bin" />
<mkdir dir="${webdavclient.build}/classes" />
<mkdir dir="${webdavclient.build}/conf" />
<mkdir dir="${webdavclient.build}/logs" />
<mkdir dir="${webdavclient.build}/doc/javadoc" />
+
+ <copy todir="${webdavclient.build}/classes">
+ <fileset dir="${slide.build}/classes">
+ <include name="**/org/apache/util/**" />
+ </fileset>
+ </copy>
+
</target>
@@ -391,7 +414,7 @@
<property name="copyright" value="" />
<javadoc sourcepath="src/webdav/client/src"
destdir="${webdavclient.build}/doc/javadoc"
- classpath="${jaxp.jar}:${xmlapi.jar}"
+ classpath="${jaxp.jar}:${xmlapi.jar}:${slide.build}/classes"
doctitle="Slide WebDAV Client JavaDoc" package="true"
noindex="false" author="true"
packagenames="org.apache.webdav.lib.*" />
@@ -424,7 +447,7 @@
<jar jarfile="${webdavclient.dist}/lib/webdavlib.jar"
basedir="${webdavclient.build}/classes"
manifest="${webdavclient.build}/classes/MANIFEST.MF"
- includes="LICENSE,README,CHANGELOG,org/apache/webdav/lib/**" />
+
includes="LICENSE,README,CHANGELOG,org/apache/util/**,org/apache/webdav/lib/**,org/apache/webdav/util/**"
/>
<echo message="Copying libraries" />
<copy todir="${webdavclient.dist}/lib" file="${jaxp.jar}" />
@@ -434,7 +457,7 @@
<jar jarfile="${webdavclient.dist}/lib/webdav.jar"
basedir="${webdavclient.build}/classes"
manifest="${webdavclient.build}/classes/MANIFEST.MF"
- includes="LICENSE,README,CHANGELOG,org/apache/webdav/**" />
+
includes="LICENSE,README,CHANGELOG,org/apache/webdav/**,org/apache/webdav/util/**,org/apache/util/**"
/>
<echo message="Copying documentation" />
<copy todir="${webdavclient.dist}/doc">
@@ -496,7 +519,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}"
+
classpath="${jta.jar}:${jaxp.jar}:${xmlapi.jar}:${jmx.jar}:${slide.build}/classes"
doctitle="Slide JavaDoc" package="true" noindex="true"
author="true" packagenames="org.*" />
</target>
@@ -540,7 +563,7 @@
<jar jarfile="${slide.dist}/lib/slide.jar"
basedir="${slide.build}/classes"
manifest="${slide.build}/classes/MANIFEST.MF"
- includes="LICENSE,README,CHANGELOG,org/apache/slide/**"
+ includes="LICENSE,README,CHANGELOG,org/apache/slide/**,org/apache/util/**"
excludes="org/apache/slide/webdav/**,org/apache/slide/manager/**" />
<echo message="Building Slide Standard Stores JAR file" />
