jumal 2005/03/02 11:13:06
Modified: wck build.xml
. build.xml
Log:
Allow to compile using JDK 1.5.
The target VM is 1.3.
The source compatibility is 1.3
Revision Changes Path
1.11 +7 -5 jakarta-slide/wck/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/wck/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 4 Feb 2005 15:30:40 -0000 1.10
+++ build.xml 2 Mar 2005 19:13:05 -0000 1.11
@@ -13,9 +13,11 @@
<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? -->
+ <!-- Target VM -->
<property name="compile.target" value="1.3"/>
- <!-- ===================================================================
-->
+ <!-- Source compatibility -->
+ <property name="compile.source" value="1.3"/>
+ <!--
=================================================================== -->
<!-- Dependencies Properties
-->
<!-- ===================================================================
-->
<property name="commons.transaction.version" value="1.1b2"/>
@@ -81,7 +83,7 @@
</target>
<target name="build-core">
<echo message="Building WCK core"/>
- <javac srcdir="src" destdir="build/classes" debug="${compile.debug}"
deprecation="${compile.deprecation}" optimize="${compile.optimize}"
+ <javac srcdir="src" destdir="build/classes" debug="${compile.debug}"
deprecation="${compile.deprecation}" optimize="${compile.optimize}"
target="${compile.target}" source="${compile.source}"
includes="**/**.java"
excludes="**/WebdavStoreMacroAdapter.java" >
<classpath refid="classpath"/>
</javac>
@@ -91,14 +93,14 @@
</target>
<target name="build-macro-store" if="supports.macro.store">
<echo message="Building macro store extension"/>
- <javac srcdir="src" destdir="build/classes" debug="${compile.debug}"
deprecation="${compile.deprecation}" optimize="${compile.optimize}"
+ <javac srcdir="src" destdir="build/classes" debug="${compile.debug}"
deprecation="${compile.deprecation}" optimize="${compile.optimize}"
target="${compile.target}" source="${compile.source}"
includes="**/WebdavStoreMacroAdapter.java" >
<classpath refid="classpath"/>
</javac>
</target>
<target name="build-additional-src" if="additional.src.dir">
<echo message="Building additional custom source from
${additional.src.dir}"/>
- <javac srcdir="${additional.src.dir}" destdir="build/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
+ <javac srcdir="${additional.src.dir}" destdir="build/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" target="${compile.target}"
source="${compile.source}">
<classpath refid="additional.classpath"/>
</javac>
</target>
1.262 +17 -11 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- build.xml 4 Feb 2005 15:30:40 -0000 1.261
+++ build.xml 2 Mar 2005 19:13:05 -0000 1.262
@@ -13,8 +13,10 @@
<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? -->
+ <!-- Target VM -->
<property name="compile.target" value="1.3"/>
+ <!-- Source compatibility -->
+ <property name="compile.source" value="1.3"/>
<!-- ===================================================================
-->
<!-- Project Properties
-->
<!-- ===================================================================
-->
@@ -206,7 +208,10 @@
<available property="sax.present"
classname="org.xml.sax.helpers.DefaultHandler" classpath="${xmlapi.jar}"/>
<available property="catalina.present"
classname="org.apache.catalina.User" classpath="${catalina.jar}"/>
<condition property="jvm14.present">
- <equals arg1="${ant.java.version}" arg2="1.4"/>
+ <or>
+ <equals arg1="${ant.java.version}" arg2="1.4"/>
+ <equals arg1="${ant.java.version}" arg2="1.5"/>
+ </or>
</condition>
<echo
message="+-------------------------------------------------------"/>
<echo message="| Build environment for ${name} ${version}"/>
@@ -225,6 +230,7 @@
<echo message=" Display deprecation info
${compile.deprecation}"/>
<echo message=" Optimize ${compile.optimize}"/>
<echo message=" Target ${compile.target}"/>
+ <echo message=" Source ${compile.source}"/>
<echo message=" Build directory ${slide.build}"/>
<echo message=" Distribution directory ${slide.dist}"/>
<echo message=" Distribution archive name ${slide.archive}"/>
@@ -280,7 +286,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"
target="${compile.target}">
+ <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}" source="${compile.source}">
<classpath refid="main.classpath"/>
<exclude name="**/Slide.java" unless="jmx.present"/>
<exclude name="**/SlideMBean.java" unless="jmx.present"/>
@@ -297,7 +303,7 @@
</fileset>
</copy>
<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" target="${compile.target}">
+ <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}"
source="${compile.source}">
<classpath refid="webdavservlet.classpath"/>
</javac>
<copy todir="${slide.build}/classes">
@@ -307,7 +313,7 @@
</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,**/*Test*,**/ojb/tools/*"
target="${compile.target}">
+ <javac srcdir="src/stores" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
excludes="**/CVS/**,**/package.html,**/*Test*,**/ojb/tools/*"
target="${compile.target}" source="${compile.source}">
<classpath refid="stores.classpath"/>
</javac>
<copy todir="${slide.build}/classes">
@@ -316,11 +322,11 @@
</fileset>
</copy>
<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"
target="${compile.target}">
+ <javac srcdir="src/roles" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html"
target="${compile.target}" source="${compile.source}">
<classpath refid="stores.classpath"/>
</javac>
<echo message="Building JAAS LoginModule"/>
- <javac srcdir="src/jaas" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" target="${compile.target}">
+ <javac srcdir="src/jaas" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" target="${compile.target}"
source="${compile.source}">
<classpath refid="main.classpath"/>
</javac>
</target>
@@ -329,7 +335,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/**"
target="${compile.target}">
+ <javac srcdir="src/wrappers" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" includes="**/log4j/**" excludes="**/CVS/**"
target="${compile.target}" source="${compile.source}">
<classpath refid="wrappers.classpath"/>
</javac>
<copy file="src/etc/MANIFEST.MF"
tofile="${slide.build}/classes/MANIFEST.MF"/>
@@ -341,7 +347,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/**"
target="${compile.target}">
+ <javac srcdir="src/jdk14" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" includes="**" excludes="**/CVS/**"
target="${compile.target}" source="${compile.source}">
<classpath refid="wrappers.classpath"/>
</javac>
<copy file="src/etc/MANIFEST.MF"
tofile="${slide.build}/classes/MANIFEST.MF"/>
@@ -404,7 +410,7 @@
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
includes="**/ojb/tools/*.java"
- target="${compile.target}"
+ target="${compile.target}" source="${compile.source}"
classpathref="ojbsql.classpath"/>
</target>
<!-- ===================================================================
-->
@@ -635,7 +641,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/**"
target="${compile.target}">
+ <javac srcdir="src/wrappers" destdir="${slide.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" includes="**" excludes="**/CVS/**"
target="${compile.target}" source="${compile.source}">
<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]
