From a93fce3f5105854eeb8341437779e5e3e2bb72f1 Mon Sep 17 00:00:00 2001
From: Silenio Quarti <silenio_quarti@ca.ibm.com>
Date: Wed, 17 Jul 2013 13:24:56 -0400
Subject: Bug 413116 - Build fails due to SWT at 1.5 level?

---
 bundles/org.eclipse.swt/buildFragment.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'bundles/org.eclipse.swt/buildFragment.xml')

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" />
-- 
cgit