Author: rdonkin
Date: Thu Jun 14 07:38:47 2007
New Revision: 547258
URL: http://svn.apache.org/viewvc?view=rev&rev=547258
Log:
Don't build Mordred whith Java 6.
Modified:
james/server/trunk/build-tools/module-build.xml
james/server/trunk/mordred-library/build.xml
Modified: james/server/trunk/build-tools/module-build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/build-tools/module-build.xml?view=diff&rev=547258&r1=547257&r2=547258
==============================================================================
--- james/server/trunk/build-tools/module-build.xml (original)
+++ james/server/trunk/build-tools/module-build.xml Thu Jun 14 07:38:47 2007
@@ -39,13 +39,15 @@
<target
name='conditional-clean'
depends='check-environment'
- if='do.build.clean'>
+ if='do.build.clean'
+ unless='dont.build.module'>
<Clean/>
</target>
<target
name='set-classpath'
- depends='check-environment'>
+ depends='check-environment'
+ unless='dont.build.module'>
<SetBaseClasspaths/>
</target>
@@ -56,7 +58,8 @@
<target
name='clean'
description='Cleans build residues.'
- depends='check-environment'>
+ depends='check-environment'
+ unless='dont.build.module'>
<property name='do.build.clean' value='true'/>
<antcall target='conditional-clean'/>
</target>
@@ -64,7 +67,8 @@
<target
name='build'
description='Builds without cleaning'
- depends='check-environment, conditional-clean, set-classpath'>
+ depends='check-environment, conditional-clean, set-classpath'
+ unless='dont.build.module'>
<echo>Building ${name.module}</echo>
<CompileMainSource/>
</target>
@@ -72,7 +76,8 @@
<target
name='test'
description='Builds and tests without cleaning'
- depends='build, check-environment, conditional-clean, set-classpath'>
+ depends='build, check-environment, conditional-clean, set-classpath'
+ unless='dont.build.module'>
<echo>Testing ${name.module}</echo>
<CompileTests/>
<RunTests/>
@@ -81,7 +86,8 @@
<target
name='dist'
description='Builds and creates distribution without cleaning'
- depends='build, check-environment, conditional-clean'>
+ depends='build, check-environment, conditional-clean'
+ unless='dont.build.module'>
<CreateJar
name='${name.module}'
bin='${dir.build.bin}'
@@ -96,11 +102,13 @@
<target
name='main'
description='Builds, tests and distributes without cleaning'
- depends='build, test, dist, check-environment, conditional-clean'/>
+ depends='build, test, dist, check-environment, conditional-clean'
+ unless='dont.build.module'/>
<target
name='full'
- description='Cleans, builds, tests and distributes'>
+ description='Cleans, builds, tests and distributes'
+ unless='dont.build.module'>
<property name='do.build.clean' value='true'/>
<antcall target="main"/>
</target>
Modified: james/server/trunk/mordred-library/build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mordred-library/build.xml?view=diff&rev=547258&r1=547257&r2=547258
==============================================================================
--- james/server/trunk/mordred-library/build.xml (original)
+++ james/server/trunk/mordred-library/build.xml Thu Jun 14 07:38:47 2007
@@ -1,6 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="main" name="mordred-library">
- <description>Builds mordred-library module. This is an library
module.</description>
- <property name="name.module" value="mordred-library" />
- <import file="../build-tools/library-build.xml" optional="no" />
+ <description>Builds mordred-library module. This is an library
module.</description>
+ <property name="name.module" value="mordred-library" />
+ <import file="../build-tools/library-build.xml" optional="no" />
+
+ <!-- Mordred cannot be built with Java 6 or higher -->
+ <condition property='dont.build.module' value='true'>
+ <not>
+ <or>
+ <equals arg1='${ant.java.version}' arg2='1.5'/>
+ <equals arg1='${ant.java.version}' arg2='1.4'/>
+ <equals arg1='${ant.java.version}' arg2='1.3'/>
+ <equals arg1='${ant.java.version}' arg2='1.2'/>
+ </or>
+ </not>
+ </condition>
+
+ <target name='java-version-warning' if='dont.build.module'>
+ <echo>Mordred is incompatible with Java 6</echo>
+ </target>
+
+ <target name='check-environment' depends='java-version-warning,
master-module-template.check-environment'>
+ </target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
