diff options
author | Silenio Quarti | 2013-07-17 17:24:56 +0000 |
---|---|---|
committer | Silenio Quarti | 2013-07-17 17:24:56 +0000 |
commit | a93fce3f5105854eeb8341437779e5e3e2bb72f1 (patch) | |
tree | 92081a76963e7b14bd8e6325c7ac1d41f771c6a3 /bundles/org.eclipse.swt/buildFragment.xml | |
parent | 1eab7f99f5f89854708e313d1a5e0071436ffd0c (diff) | |
download | eclipse.platform.swt-a93fce3f5105854eeb8341437779e5e3e2bb72f1.tar.gz eclipse.platform.swt-a93fce3f5105854eeb8341437779e5e3e2bb72f1.tar.xz eclipse.platform.swt-a93fce3f5105854eeb8341437779e5e3e2bb72f1.zip |
Bug 413116 - Build fails due to SWT at 1.5 level?v4401bI20130717-1600
Diffstat (limited to 'bundles/org.eclipse.swt/buildFragment.xml')
-rw-r--r-- | bundles/org.eclipse.swt/buildFragment.xml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml index ba230aba08..f5fb504a98 100644 --- a/bundles/org.eclipse.swt/buildFragment.xml +++ b/bundles/org.eclipse.swt/buildFragment.xml @@ -25,8 +25,8 @@ <property name="destination" value="${fragmentdir}" /> <property name="javacVerbose" value="false" /> <property name="logExtension" value=".xml" /> - <property name="javacSource" value="1.5" /> - <property name="javacTarget" value="1.5" /> + <property name="javacSource" value="1.3" /> + <property name="javacTarget" value="1.2" /> <condition property="bootclasspath" value=""> <equals arg1="${swt.os}" arg2="macosx"/> </condition> @@ -36,6 +36,12 @@ </fileset> </path> <property name="bootclasspath" refid="path_bootclasspath" /> + <condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"> + <isset property="CDC-1.0/Foundation-1.0" /> + </condition> + <condition property="bundleBootClasspath" value="${J2SE-1.3}"> + <isset property="J2SE-1.3" /> + </condition> <property name="bundleJavacSource" value="${javacSource}" /> <property name="bundleJavacTarget" value="${javacTarget}" /> <property name="bundleBootClasspath" value="${bootclasspath}" /> @@ -66,7 +72,7 @@ <delete dir="${temp.folder}/@dot.bin" /> <mkdir dir="${temp.folder}/@dot.bin" /> <antcall target="copy.${swt.ws}.src"/> - <javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="${debug}" failonerror="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"> + <javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="${debug}" failonerror="no" classpath="${plugindir}/extra_jars/exceptions.jar" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"> <src path="${temp.folder}/@dot.src/"/> <compilerarg line="-log '${temp.folder}'/@dot.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" /> <compilerarg line="${compilerArg}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" /> |