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 lu...@apache.org on 2004/09/28 15:26:13 UTC
cvs commit: jakarta-slide build.properties.sample build.xml
luetzkendorf 2004/09/28 06:26:13
Modified: . build.properties.sample build.xml
Log:
merge with release branch
Revision Changes Path
1.23 +2 -1 jakarta-slide/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-slide/build.properties.sample,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.properties.sample 23 Aug 2004 17:57:06 -0000 1.22
+++ build.properties.sample 28 Sep 2004 13:26:12 -0000 1.23
@@ -18,6 +18,7 @@
compile.debug=on
compile.deprecation=off
compile.optimize=on
+compile.target=1.3
build.compiler=modern
1.233 +15 -10 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- build.xml 20 Sep 2004 09:04:10 -0000 1.232
+++ build.xml 28 Sep 2004 13:26:12 -0000 1.233
@@ -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 -->
<!-- =================================================================== -->
@@ -48,7 +50,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 -->
<!-- =================================================================== -->
@@ -181,6 +183,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}"/>
@@ -235,7 +238,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"/>
@@ -252,19 +255,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>
@@ -273,7 +276,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"/>
@@ -285,7 +288,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"/>
@@ -403,7 +406,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">
@@ -439,7 +444,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: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org