Author: antonio
Date: Sat Nov 20 13:57:37 2004
New Revision: 106007
Modified:
cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
Log:
Fail if JVM is not 1.3 or superior
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml Sat Nov 20
13:57:37 2004
@@ -29,20 +29,15 @@
<property file="src/java/org/apache/cocoon/cocoon.properties"/>
<!-- Detecting the current jvm -->
- <condition property="target.vm" value="1.5">
- <equals arg1="1.5" arg2="${ant.java.version}"/>
- </condition>
- <condition property="target.vm" value="1.4">
- <equals arg1="1.4" arg2="${ant.java.version}"/>
- </condition>
- <condition property="target.vm" value="1.3">
- <not>
+ <condition property ="target.vm" value="${ant.java.version}">
+ <not>
<or>
- <equals arg1="1.4" arg2="${ant.java.version}"/>
- <equals arg1="1.5" arg2="${ant.java.version}"/>
+ <equals arg1="1.1" arg2="${ant.java.version}"/>
+ <equals arg1="1.2" arg2="${ant.java.version}"/>
</or>
- </not>
+ </not>
</condition>
+ <fail unless="target.vm">Please use a JVM 1.3 or superior to compile
cocoon</fail>
<!-- The location of tools.jar, relative to the JAVA_HOME home. -->
<property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
@@ -109,7 +104,7 @@
<!-- Alias for the loglevel -->
<property name="loglevel" value="${build.webapp.loglevel}"/>
-
+
<!-- Set classpath -->
<path id="classpath">
<fileset dir="${lib.local}">
@@ -124,7 +119,7 @@
<fileset dir="${lib.core}">
<include name="*.jar"/>
</fileset>
- <!-- Currently, we have no JVM dependent libraries
+ <!-- Currently, we have no JVM dependent libraries
<fileset dir="${lib.core}/jvm${target.vm}">
<include name="*.jar"/>
</fileset>
@@ -163,7 +158,7 @@
classpath="${tools.tasks.dest}"/>
<!-- A task for sitemap components -->
- <taskdef name="sitemap-components"
+ <taskdef name="sitemap-components"
classname="SitemapTask"
classpathref="tasks.classpath"/>
