summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-02-28 06:33:06 (EST)
committer Stephan Born2012-04-26 09:53:29 (EDT)
commita052981ffe7c19e6a7a62728f22232b3e5b96ba3 (patch)
treee7e7e8dede666d99b02ac85a42906eeaea7425d6
parent5adddcc20affd2c0df08bd4f6781b55414983bd0 (diff)
downloadorg.eclipse.stardust.build.tools-a052981ffe7c19e6a7a62728f22232b3e5b96ba3.zip
org.eclipse.stardust.build.tools-a052981ffe7c19e6a7a62728f22232b3e5b96ba3.tar.gz
org.eclipse.stardust.build.tools-a052981ffe7c19e6a7a62728f22232b3e5b96ba3.tar.bz2
Jira-ID: CRNT-23823
CRNT-23823 Adapt build process in order to compile product with Java6 git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/build.tools@54102 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--commons-build.xml48
1 files changed, 24 insertions, 24 deletions
diff --git a/commons-build.xml b/commons-build.xml
index 15f0e2f..f70163e 100644
--- a/commons-build.xml
+++ b/commons-build.xml
@@ -50,7 +50,7 @@
</sequential>
</macrodef>
- <macrodef name="javac-java5" uri="&ns-ant-macros;" xmlns:ipp="&ns-ant-macros;">
+ <macrodef name="javac-java6" uri="&ns-ant-macros;" xmlns:ipp="&ns-ant-macros;">
<attribute name="srcdir" />
<attribute name="sourcepath" default="" />
<attribute name="destdir" />
@@ -63,10 +63,10 @@
<element name="configurationElements" implicit="yes" />
<sequential>
- <ipp:javac5-init />
+ <ipp:javac6-init />
- <javac compiler="extJavac" executable="${jdk15+.bin.javac}"
- source="1.5" target="1.5"
+ <javac compiler="extJavac" executable="${jdk16+.bin.javac}"
+ source="1.6" target="1.6"
srcdir="@{srcdir}" sourcepath="@{sourcepath}"
destdir="@{destdir}"
debug="@{debug}" debuglevel="@{debuglevel}" deprecation="@{deprecation}"
@@ -106,60 +106,60 @@
</sequential>
</macrodef>
- <macrodef name="java5-init" uri="&ns-ant-macros;" xmlns:ipp="&ns-ant-macros;">
+ <macrodef name="java6-init" uri="&ns-ant-macros;" xmlns:ipp="&ns-ant-macros;">
<sequential>
<ipp:osFamily-init />
- <pathconvert property="jdk15+.bin.java" setonempty="true" pathsep="/">
+ <pathconvert property="jdk16+.bin.java" setonempty="true" pathsep="/">
<path>
- <fileset dir="${java15.home}">
+ <fileset dir="${java16.home}">
<include if="os.family.unix" name="bin/java" />
<include if="os.family.windows" name="bin/java.exe" />
</fileset>
</path>
</pathconvert>
- <pathconvert property="jdk15+.bin.javac" setonempty="true" pathsep="/">
+ <pathconvert property="jdk16+.bin.javac" setonempty="true" pathsep="/">
<path>
- <fileset dir="${java15.home}">
+ <fileset dir="${java16.home}">
<include if="os.family.unix" name="bin/javac" />
<include if="os.family.windows" name="bin/javac.exe" />
</fileset>
</path>
</pathconvert>
- <fail unless="jdk15+.bin.java" message="Failed resolving location of Java 1.5+ runtime." />
+ <fail unless="jdk16+.bin.java" message="Failed resolving location of Java 1.6+ runtime." />
- <condition property="exists.jdk15+.bin.java">
- <available file="${jdk15+.bin.java}" />
+ <condition property="exists.jdk16+.bin.java">
+ <available file="${jdk16+.bin.java}" />
</condition>
- <fail unless="exists.jdk15+.bin.java" message="Failed validating location of Java 1.5+ runtime at ${jdk15+.bin.java}." />
+ <fail unless="exists.jdk16+.bin.java" message="Failed validating location of Java 1.6+ runtime at ${jdk16+.bin.java}." />
- <!-- TODO invoke java -version, verify 1.5+ -->
- <echo message="Resolved Java 1.5+ runtime to '${jdk15+.bin.java}'." />
+ <!-- TODO invoke java -version, verify 1.6+ -->
+ <echo message="Resolved Java 1.6+ runtime to '${jdk16+.bin.java}'." />
</sequential>
</macrodef>
- <macrodef name="javac5-init" uri="&ns-ant-macros;" xmlns:ipp="&ns-ant-macros;">
+ <macrodef name="javac6-init" uri="&ns-ant-macros;" xmlns:ipp="&ns-ant-macros;">
<sequential>
<ipp:osFamily-init />
<ipp:javacMemory-init />
- <pathconvert property="jdk15+.bin.javac" setonempty="true" pathsep="/">
+ <pathconvert property="jdk16+.bin.javac" setonempty="true" pathsep="/">
<path>
- <fileset dir="${java15.home}">
+ <fileset dir="${java16.home}">
<include if="os.family.unix" name="bin/javac" />
<include if="os.family.windows" name="bin/javac.exe" />
</fileset>
</path>
</pathconvert>
- <fail unless="jdk15+.bin.javac" message="Failed resolving location of Java 1.5+ compiler." />
+ <fail unless="jdk16+.bin.javac" message="Failed resolving location of Java 1.6+ compiler." />
- <condition property="exists.jdk15+.bin.javac">
- <available file="${jdk15+.bin.javac}" />
+ <condition property="exists.jdk16+.bin.javac">
+ <available file="${jdk16+.bin.javac}" />
</condition>
- <fail unless="exists.jdk15+.bin.javac" message="Failed validating location of Java 1.5+ compiler at ${jdk15+.bin.javac}." />
- <!-- TODO invoke java -version, verify 1.5+ -->
- <echo message="Resolved Java 1.5+ compiler to '${jdk15+.bin.javac}'." />
+ <fail unless="exists.jdk16+.bin.javac" message="Failed validating location of Java 1.6+ compiler at ${jdk16+.bin.javac}." />
+ <!-- TODO invoke java -version, verify 1.6+ -->
+ <echo message="Resolved Java 1.6+ compiler to '${jdk16+.bin.javac}'." />
</sequential>
</macrodef>