luetzkendorf 2004/09/28 06:19:28
Modified: . Tag: SLIDE_2_1_RELEASE_BRANCH build.xml
Log:
added support for an compile target parameter (compile.target, default=1.3)
removed servlet-2.3.jar from distribution
Revision Changes Path
No revision
No revision
1.229.2.3 +15 -10 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.229.2.2
retrieving revision 1.229.2.3
diff -u -r1.229.2.2 -r1.229.2.3
--- build.xml 17 Sep 2004 12:24:16 -0000 1.229.2.2
+++ build.xml 28 Sep 2004 13:19:27 -0000 1.229.2.3
@@ -13,6 +13,8 @@
<property name="compile.deprecation" value="true"/>
<!-- Should Java compilations set the 'optimize' compiler option? -->
<property name="compile.optimize" value="true"/>
+ <!-- Should Java compilations set the 'optimize' compiler option? -->
+ <property name="compile.target" value="1.3"/>
<!-- =================================================================== -->
<!-- Project Properties -->
<!-- =================================================================== -->
@@ -47,7 +49,7 @@
<property name="xml-im-exporter.jar" value="${lib.dir}/xml-im-exporter1.1.jar"/>
<property name="commons-transaction.jar"
value="${lib.dir}/commons-transaction-20040805.jar"/>
<property name="commons-codec.jar" value="${lib.dir}/commons-codec-1.3.jar"/>
- <property name="jakarta-slide-webdavlib.jar"
value="${lib.dir}/jakarta-slide-webdavlib-2.1b1.jar"/>
+ <property name="jakarta-slide-webdavlib.jar"
value="${lib.dir}/jakarta-slide-webdavlib-2.1b1.jar"/>
<!-- =================================================================== -->
<!-- Produced jars Properties -->
<!-- =================================================================== -->
@@ -179,6 +181,7 @@
<echo message=" Generate debugging info ${compile.debug}"/>
<echo message=" Display deprecation info ${compile.deprecation}"/>
<echo message=" Optimize ${compile.optimize}"/>
+ <echo message=" Target ${compile.target}"/>
<echo message=" Build directory ${slide.build}"/>
<echo message=" Distribution directory ${slide.dist}"/>
<echo message=" Distribution archive name ${slide.archive}"/>
@@ -233,7 +236,7 @@
</fileset>
</copy>
<echo message="Building Slide Core API"/>
- <javac srcdir="src/share" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
+ <javac srcdir="src/share" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html"
target="${compile.target}">
<classpath refid="main.classpath"/>
<exclude name="**/Slide.java" unless="jmx.present"/>
<exclude name="**/SlideMBean.java" unless="jmx.present"/>
@@ -250,19 +253,19 @@
</fileset>
</copy>
<echo message="Building Standard Stores"/>
- <javac srcdir="src/stores" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html">
+ <javac srcdir="src/stores" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html"
target="${compile.target}">
<classpath refid="stores.classpath"/>
</javac>
<echo message="Building Default Roles"/>
- <javac srcdir="src/roles" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html">
+ <javac srcdir="src/roles" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html"
target="${compile.target}">
<classpath refid="stores.classpath"/>
</javac>
<echo message="Building Slide WebDAV Servlet"/>
- <javac srcdir="src/webdav/server" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" includes="**/webdav/**"
excludes="**/CVS/**,**/package.html">
+ <javac srcdir="src/webdav/server" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" includes="**/webdav/**"
excludes="**/CVS/**,**/package.html" target="${compile.target}">
<classpath refid="webdavservlet.classpath"/>
</javac>
<echo message="Building JAAS LoginModule"/>
- <javac srcdir="src/jaas" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
+ <javac srcdir="src/jaas" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" target="${compile.target}">
<classpath refid="main.classpath"/>
</javac>
</target>
@@ -271,7 +274,7 @@
<!-- This target requires Log4j -->
<!-- =================================================================== -->
<target name="log4j-logger" depends="main">
- <javac srcdir="src/wrappers" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" includes="**/log4j/**" excludes="**/CVS/**">
+ <javac srcdir="src/wrappers" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" includes="**/log4j/**" excludes="**/CVS/**"
target="${compile.target}">
<classpath refid="wrappers.classpath"/>
</javac>
<copy file="src/etc/MANIFEST.MF"
tofile="${slide.build}/classes/MANIFEST.MF"/>
@@ -283,7 +286,7 @@
<!-- This target requires JDK1.4 -->
<!-- =================================================================== -->
<target name="jdk14-logging" depends="main" if="jvm14.present">
- <javac srcdir="src/jdk14" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" includes="**" excludes="**/CVS/**">
+ <javac srcdir="src/jdk14" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" includes="**" excludes="**/CVS/**"
target="${compile.target}">
<classpath refid="wrappers.classpath"/>
</javac>
<copy file="src/etc/MANIFEST.MF"
tofile="${slide.build}/classes/MANIFEST.MF"/>
@@ -401,7 +404,9 @@
</copy>
<echo message="Copying libraries"/>
<copy todir="${slide.dist}/slide/lib">
- <fileset dir="${slide.build}/lib"/>
+ <fileset dir="${slide.build}/lib">
+ <exclude name="servlet*.jar"/>
+ </fileset>
</copy>
</target>
<target name="dist-xml" unless="jvm14.present">
@@ -437,7 +442,7 @@
<!-- This target requires Tomcat 4 or 5 -->
<!-- =================================================================== -->
<target name="catalina-wrapper" depends="dist" if="catalina.present">
- <javac srcdir="src/wrappers" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" includes="**" excludes="**/CVS/**">
+ <javac srcdir="src/wrappers" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" includes="**" excludes="**/CVS/**"
target="${compile.target}">
<classpath refid="wrappers.classpath"/>
<exclude name="**/catalina/**" unless="catalina.present"/>
<exclude name="**/log4j/**"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
