cziegeler 2002/07/12 03:26:55
Modified: . build.xml changes.xml
lib jars.xml
Added: lib/core/jvm1.2 avalon-excalibur-vm12-20020705.jar
lib/core/jvm1.4 avalon-excalibur-vm14-20020705.jar
Removed: lib/core/jvm13 avalon-excalibur-vm13-20020705.jar
lib/core/jvm14 avalon-excalibur-vm14-20020705.jar
Log:
Build system now automatically detects the target vm and sets property itself!
Revision Changes Path
1.244 +75 -66 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- build.xml 12 Jul 2002 09:58:13 -0000 1.243
+++ build.xml 12 Jul 2002 10:26:53 -0000 1.244
@@ -118,72 +118,84 @@
<property name="build.compiler.pedantic" value="false"/>
<property name="build.compiler.depend" value="true"/>
<property name="build.compiler.fulldepend" value="true"/>
- <!-- specify the target Java Virtual Machine so that compatible libraries
- can be included with the build. Default this to 13 -->
- <property name="jvm-target" value="13" />
-
- <!-- =================================================================== -->
- <!-- Indentify Classpath -->
- <!-- =================================================================== -->
- <path id="classpath">
- <fileset dir="./lib/local">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="./lib/core">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="./lib/core/jvm${jvm-target}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="./lib/optional">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="anttasks.classpath">
- <fileset dir="./lib/local">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="./lib/core">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="./lib/core/jvm${jvm-target}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="./lib/optional">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="./tools/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="scratchpad.classpath">
- <fileset dir="./lib/local">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="./lib/core">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="./lib/core/jvm${jvm-target}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="./lib/optional">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="./src/scratchpad/lib">
- <include name="*.jar"/>
- </fileset>
- <!-- FIXME : how to build a path that references a property set in 'init'
target ? -->
- <pathelement path="./build/cocoon/classes"/>
- </path>
<!-- =================================================================== -->
<!-- Initialization target -->
<!-- =================================================================== -->
<target name="init">
+
<tstamp/>
+ <!-- Detecting the current jvm -->
+ <condition property="target.vm" value="1.4">
+ <equals arg1="1.4" arg2="${java.specification.version}"/>
+ </condition>
+ <condition property="target.vm" value="1.2">
+ <not>
+ <equals arg1="1.4" arg2="${java.specification.version}"/>
+ </not>
+ </condition>
+
+ <!-- =================================================================== -->
+ <!-- Identify Classpath -->
+ <!-- =================================================================== -->
+ <path id="classpath">
+ <fileset dir="./lib/local">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/core">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/core/jvm${target.vm}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/optional">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="anttasks.classpath">
+ <fileset dir="./lib/local">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/core">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/core/jvm${target.vm}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/optional">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./tools/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="scratchpad.classpath">
+ <fileset dir="./lib/local">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/core">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/core/jvm${target.vm}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/optional">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./src/scratchpad/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <!-- FIXME : how to build a path that references a property set in 'init'
target ? -->
+ <pathelement path="./build/cocoon/classes"/>
+ </path>
+
+ <!-- =================================================================== -->
+ <!-- Properties -->
+ <!-- =================================================================== -->
+
<property name="fullname" value="Apache Cocoon"/>
<property name="Name" value="Cocoon"/>
<property name="name" value="cocoon"/>
@@ -198,13 +210,11 @@
<echo message="using build file ${ant.file}"/>
<echo message="--------------------------------------------------------------"/>
<echo message=" WARNING: "/>
- <echo message=" This build is targetted for use with JVM ${jvm-target}"/>
+ <echo message=" This build is targetted for use with JVM ${target.vm}"/>
<echo message=" "/>
<echo message=" Using this build on a virtual machine other than the one "/>
<echo message=" it is targetted for may result in runtime errors. "/>
<echo message=" "/>
- <echo message=" Set property jvm-target to '13' or '14' to switch between "/>
- <echo message=" JVM targets 1.3 and before and 1.4 respectively. "/>
<echo message="--------------------------------------------------------------"/>
<property name="debug" value="on"/>
@@ -212,7 +222,6 @@
<property name="deprecation" value="off"/>
<property name="nowarn" value="on"/>
<!-- <property name="build.compiler" value="classic"/> -->
- <property name="target.vm" value="1.2"/>
<property name="src.dir" value="./src"/>
<property name="java.dir" value="${src.dir}/java"/>
@@ -1206,7 +1215,7 @@
<fileset dir="${lib.dir}/core">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/core/jvm${jvm-target}">
+ <fileset dir="${lib.dir}/core/jvm${target.vm}">
<include name="*.jar"/>
</fileset>
<fileset dir="${lib.dir}/optional">
@@ -1231,7 +1240,7 @@
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/core/jvm${jvm-target}">
+ <fileset dir="${lib.dir}/core/jvm${target.vm}">
<include name="*.jar"/>
</fileset>
</copy>
@@ -1701,7 +1710,7 @@
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/core/jvm${jvm-target}">
+ <fileset dir="${lib.dir}/core/jvm${target.vm}">
<include name="*.jar"/>
</fileset>
</copy>
1.211 +4 -3 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- changes.xml 12 Jul 2002 09:58:14 -0000 1.210
+++ changes.xml 12 Jul 2002 10:26:53 -0000 1.211
@@ -39,8 +39,9 @@
</devs>
<release version="@version@" date="@date@">
- <action dev="CZ" type="add" fixes-bug="10505" due-to="Stuart Roebuck"
due-to-email="[EMAIL PROTECTED]">
- When building Cocoon it is required to set the targetted JVM (either 1.3 (means
1.3 or lower) or 1.4.
+ <action dev="CZ" type="add">
+ When Cocoon is built, the build system automatically detects the current jvm and
builds
+ a target for this virtual machine. This is eiter JVM 1.4 or JVM 1.2 upto 1.3.
</action>
<action dev="SMS" type="update" fixes-bug="9521" due-to="Andrew Timberlake"
due-to-email="[EMAIL PROTECTED]">
Applied patch to add javascript support for the mozilla browser for transforming
xml
1.18 +2 -2 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jars.xml 12 Jul 2002 09:58:14 -0000 1.17
+++ jars.xml 12 Jul 2002 10:26:53 -0000 1.18
@@ -15,7 +15,7 @@
<description>Part of jakarta-avalon, it is a set of classes and patterns that
support high level server development. (This JAR has been compiled on Java
1.3 to be run on JVM 1.3 or earlier.)</description>
<used-by>Cocoon</used-by>
- <lib>core/jvm13/avalon-excalibur-vm13-20020705.jar</lib>
+ <lib>core/jvm1.2/avalon-excalibur-vm12-20020705.jar</lib>
<homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
</file>
<file>
@@ -23,7 +23,7 @@
<description>Part of jakarta-avalon, it is a set of classes and patterns that
support high level server development. (This JAR has been compiled on Java
1.4 to be run on JVM 1.4.)</description>
<used-by>Cocoon</used-by>
- <lib>core/jvm14/avalon-excalibur-vm14-20020705.jar</lib>
+ <lib>core/jvm1.4/avalon-excalibur-vm14-20020705.jar</lib>
<homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
</file>
<file>
1.1 xml-cocoon2/lib/core/jvm1.2/avalon-excalibur-vm12-20020705.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/jvm1.4/avalon-excalibur-vm14-20020705.jar
<<Binary file>>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
