diff options
author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2013-07-17 13:24:56 -0400 |
---|---|---|
committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2013-07-17 13:24:56 -0400 |
commit | a93fce3f5105854eeb8341437779e5e3e2bb72f1 (patch) | |
tree | 92081a76963e7b14bd8e6325c7ac1d41f771c6a3 /bundles | |
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?
Diffstat (limited to 'bundles')
-rw-r--r-- | bundles/org.eclipse.swt.tools/.classpath | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.swt.tools/.settings/org.eclipse.jdt.core.prefs | 13 | ||||
-rw-r--r-- | bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/.classpath_carbon | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/.classpath_cocoa | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/.classpath_dojo | 1 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/.classpath_gtk | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/.classpath_motif | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/.classpath_photon | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/.classpath_win32 | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/.classpath_wpf | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/.classpath_wpf_e4 | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs | 16 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/META-INF/MANIFEST.MF | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/buildFragment.xml | 12 |
15 files changed, 43 insertions, 30 deletions
diff --git a/bundles/org.eclipse.swt.tools/.classpath b/bundles/org.eclipse.swt.tools/.classpath index a23e6d08aa..22ab26bdb9 100644 --- a/bundles/org.eclipse.swt.tools/.classpath +++ b/bundles/org.eclipse.swt.tools/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="JNI Generation"/> <classpathentry kind="src" path="Mac Generation"/> diff --git a/bundles/org.eclipse.swt.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.swt.tools/.settings/org.eclipse.jdt.core.prefs index 416f4fb696..7f64b31e75 100644 --- a/bundles/org.eclipse.swt.tools/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.swt.tools/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,12 @@ +#Mon Dec 11 15:13:24 EST 2006 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.source=1.3 diff --git a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF index 51da5abe2e..6d520a5009 100644 --- a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Export-Package: org.eclipse.swt.tools, org.eclipse.swt.tools.internal; x-internal:=true Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: J2SE-1.4 Require-Bundle: org.eclipse.swt;bundle-version="3.4.0", org.eclipse.core.runtime;bundle-version="3.4.0", org.eclipse.core.resources;bundle-version="3.4.0", diff --git a/bundles/org.eclipse.swt/.classpath_carbon b/bundles/org.eclipse.swt/.classpath_carbon index 6b105fc372..3a1e47883d 100644 --- a/bundles/org.eclipse.swt/.classpath_carbon +++ b/bundles/org.eclipse.swt/.classpath_carbon @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/> <classpathentry kind="src" path="Eclipse SWT/carbon"/> <classpathentry kind="src" path="Eclipse SWT/common"/> <classpathentry kind="src" path="Eclipse SWT/common_j2se"/> @@ -34,5 +34,6 @@ <classpathentry kind="src" path="Eclipse SWT OpenGL/carbon"/> <classpathentry kind="src" path="Eclipse SWT OpenGL/common"/> <classpathentry kind="src" path="Eclipse SWT Theme/carbon"/> + <classpathentry kind="lib" path="extra_jars/exceptions.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.swt/.classpath_cocoa b/bundles/org.eclipse.swt/.classpath_cocoa index a959a32cd6..8ed1d226a6 100644 --- a/bundles/org.eclipse.swt/.classpath_cocoa +++ b/bundles/org.eclipse.swt/.classpath_cocoa @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/> <classpathentry kind="src" path="Eclipse SWT/cocoa"/> <classpathentry kind="src" path="Eclipse SWT/common"/> <classpathentry kind="src" path="Eclipse SWT/common_j2se"/> @@ -34,5 +34,6 @@ <classpathentry kind="src" path="Eclipse SWT OpenGL/cocoa"/> <classpathentry kind="src" path="Eclipse SWT OpenGL/common"/> <classpathentry kind="src" path="Eclipse SWT Theme/emulated"/> + <classpathentry kind="lib" path="extra_jars/exceptions.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.swt/.classpath_dojo b/bundles/org.eclipse.swt/.classpath_dojo index 0a1cc61a4c..dcf6d5e451 100644 --- a/bundles/org.eclipse.swt/.classpath_dojo +++ b/bundles/org.eclipse.swt/.classpath_dojo @@ -28,5 +28,6 @@ <classpathentry kind="src" path="Eclipse SWT Animation/common"/> <classpathentry kind="src" path="Eclipse SWT Animation/dojo"/> <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.e4.jcl"/> + <classpathentry kind="lib" path="extra_jars/exceptions.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.swt/.classpath_gtk b/bundles/org.eclipse.swt/.classpath_gtk index 2f04c32e4f..babfb2899d 100644 --- a/bundles/org.eclipse.swt/.classpath_gtk +++ b/bundles/org.eclipse.swt/.classpath_gtk @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/> <classpathentry kind="src" path="Eclipse SWT/gtk"/> <classpathentry kind="src" path="Eclipse SWT/cairo"/> <classpathentry kind="src" path="Eclipse SWT/emulated/bidi"/> @@ -38,5 +38,6 @@ <classpathentry kind="src" path="Eclipse SWT OpenGL/common"/> <classpathentry kind="src" path="Eclipse SWT Theme/gtk"/> <classpathentry kind="src" path="Eclipse SWT WebKit/gtk"/> + <classpathentry kind="lib" path="extra_jars/exceptions.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.swt/.classpath_motif b/bundles/org.eclipse.swt/.classpath_motif index 69459c707b..7c18c5c6d0 100644 --- a/bundles/org.eclipse.swt/.classpath_motif +++ b/bundles/org.eclipse.swt/.classpath_motif @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/> <classpathentry kind="src" path="Eclipse SWT/motif"/> <classpathentry kind="src" path="Eclipse SWT/cairo"/> <classpathentry kind="src" path="Eclipse SWT/emulated/bidi"/> @@ -45,5 +45,6 @@ <classpathentry kind="src" path="Eclipse SWT OpenGL/glx"/> <classpathentry kind="src" path="Eclipse SWT OpenGL/common"/> <classpathentry kind="src" path="Eclipse SWT Theme/emulated"/> + <classpathentry kind="lib" path="extra_jars/exceptions.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.swt/.classpath_photon b/bundles/org.eclipse.swt/.classpath_photon index 9d8a6124bf..3c7f8847ab 100644 --- a/bundles/org.eclipse.swt/.classpath_photon +++ b/bundles/org.eclipse.swt/.classpath_photon @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/> <classpathentry kind="src" path="Eclipse SWT/photon"/> <classpathentry kind="src" path="Eclipse SWT/emulated/graphics"/> <classpathentry kind="src" path="Eclipse SWT/emulated/bidi"/> @@ -38,5 +38,6 @@ <classpathentry kind="src" path="Eclipse SWT OpenGL/emulated"/> <classpathentry kind="src" path="Eclipse SWT OpenGL/common"/> <classpathentry kind="src" path="Eclipse SWT Theme/emulated"/> + <classpathentry kind="lib" path="extra_jars/exceptions.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.swt/.classpath_win32 b/bundles/org.eclipse.swt/.classpath_win32 index 68a2d44fbb..c981b48520 100644 --- a/bundles/org.eclipse.swt/.classpath_win32 +++ b/bundles/org.eclipse.swt/.classpath_win32 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/> <classpathentry kind="src" path="Eclipse SWT/win32"/> <classpathentry kind="src" path="Eclipse SWT/common"/> <classpathentry kind="src" path="Eclipse SWT/common_j2se"/> @@ -31,5 +31,6 @@ <classpathentry kind="src" path="Eclipse SWT OpenGL/win32"/> <classpathentry kind="src" path="Eclipse SWT OpenGL/common"/> <classpathentry kind="src" path="Eclipse SWT Theme/win32"/> + <classpathentry kind="lib" path="extra_jars/exceptions.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.swt/.classpath_wpf b/bundles/org.eclipse.swt/.classpath_wpf index 8d34cbf331..9d2426f0ec 100644 --- a/bundles/org.eclipse.swt/.classpath_wpf +++ b/bundles/org.eclipse.swt/.classpath_wpf @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/> <classpathentry kind="src" path="Eclipse SWT/wpf"/> <classpathentry kind="src" path="Eclipse SWT/common"/> <classpathentry kind="src" path="Eclipse SWT/common_j2se"/> @@ -34,5 +34,6 @@ <classpathentry kind="src" path="Eclipse SWT OpenGL/common"/> <classpathentry kind="src" path="Eclipse SWT Theme/emulated"/> <classpathentry kind="src" path="Eclipse SWT Effects/emulated"/> + <classpathentry kind="lib" path="extra_jars/exceptions.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.swt/.classpath_wpf_e4 b/bundles/org.eclipse.swt/.classpath_wpf_e4 index 295916de48..9f35602dca 100644 --- a/bundles/org.eclipse.swt/.classpath_wpf_e4 +++ b/bundles/org.eclipse.swt/.classpath_wpf_e4 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/> <classpathentry kind="src" path="Eclipse SWT/wpf"/> <classpathentry kind="src" path="Eclipse SWT/common"/> <classpathentry kind="src" path="Eclipse SWT/common_j2se"/> @@ -36,5 +36,6 @@ <classpathentry kind="src" path="Eclipse SWT Animation/wpf"/> <classpathentry kind="src" path="Eclipse SWT Effects/wpf"/> <classpathentry kind="src" path="Eclipse SWT Net/desktop"/> + <classpathentry kind="lib" path="extra_jars/exceptions.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs index 63c55971c2..887df88193 100644 --- a/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs @@ -1,14 +1,10 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled @@ -23,4 +19,4 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.3 diff --git a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF index d02483a011..8aee340d57 100644 --- a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF @@ -24,4 +24,5 @@ Export-Package: org.eclipse.swt.internal.image; x-internal:=true, org.eclipse.swt.internal.theme; x-internal:=true Eclipse-ExtensibleAPI: true -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, + J2SE-1.3 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" /> |