Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Schorn2006-10-09 05:34:30 -0400
committerMarkus Schorn2006-10-09 05:34:30 -0400
commit389e4a0e51219cb0728e6cb544bc81ff17ab98c5 (patch)
tree86fd34084d82160c19708b9ce99c2b0c5dc3dd0a
parent2b21a7091fa3f712279a13d81c029721d52e2bfd (diff)
downloadorg.eclipse.cdt-389e4a0e51219cb0728e6cb544bc81ff17ab98c5.tar.gz
org.eclipse.cdt-389e4a0e51219cb0728e6cb544bc81ff17ab98c5.tar.xz
org.eclipse.cdt-389e4a0e51219cb0728e6cb544bc81ff17ab98c5.zip
Enforces 1.4 compatibility for org.eclipse.cdt.core.tests
-rw-r--r--core/org.eclipse.cdt.core.tests/.classpath4
-rw-r--r--core/org.eclipse.cdt.core.tests/.settings/org.eclipse.jdt.core.prefs16
-rw-r--r--core/org.eclipse.cdt.core.tests/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--core/org.eclipse.cdt.core.tests/.settings/org.eclipse.pde.prefs14
-rw-r--r--core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF1
-rw-r--r--core/org.eclipse.cdt.core.tests/build.properties5
-rw-r--r--core/org.eclipse.cdt.core.tests/plugin.xml10
-rw-r--r--releng/org.eclipse.cdt.releng/testing/build.properties4
8 files changed, 40 insertions, 17 deletions
diff --git a/core/org.eclipse.cdt.core.tests/.classpath b/core/org.eclipse.cdt.core.tests/.classpath
index 74bbb31abb..f0d7b04646 100644
--- a/core/org.eclipse.cdt.core.tests/.classpath
+++ b/core/org.eclipse.cdt.core.tests/.classpath
@@ -5,8 +5,8 @@
<classpathentry kind="src" path="model"/>
<classpathentry kind="src" path="parser"/>
<classpathentry kind="src" path="suite"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="regression"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/core/org.eclipse.cdt.core.tests/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.cdt.core.tests/.settings/org.eclipse.jdt.core.prefs
index 055dbae227..b207adcbeb 100644
--- a/core/org.eclipse.cdt.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.cdt.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,21 @@
-#Wed Jul 05 15:16:26 EDT 2006
+#Mon Oct 09 10:54:22 CEST 2006
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+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.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
@@ -50,3 +59,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.4
diff --git a/core/org.eclipse.cdt.core.tests/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.cdt.core.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..dac379fda5
--- /dev/null
+++ b/core/org.eclipse.cdt.core.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+#Mon Oct 09 10:54:22 CEST 2006
+eclipse.preferences.version=1
+internal.default.compliance=user
diff --git a/core/org.eclipse.cdt.core.tests/.settings/org.eclipse.pde.prefs b/core/org.eclipse.cdt.core.tests/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..ae33c672d3
--- /dev/null
+++ b/core/org.eclipse.cdt.core.tests/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,14 @@
+#Mon Oct 09 10:48:29 CEST 2006
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.deprecated=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.use-project=true
+eclipse.preferences.version=1
diff --git a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
index 33e56b373e..a872c68a69 100644
--- a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
@@ -30,3 +30,4 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.core.filebuffers
Eclipse-LazyStart: true
Bundle-Vendor: Eclipse.org
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/core/org.eclipse.cdt.core.tests/build.properties b/core/org.eclipse.cdt.core.tests/build.properties
index 3bc74ab69b..66aa1631b5 100644
--- a/core/org.eclipse.cdt.core.tests/build.properties
+++ b/core/org.eclipse.cdt.core.tests/build.properties
@@ -22,3 +22,8 @@ source.cdtcoretests.jar = failures/,\
suite/,\
misc/,\
regression/
+
+jre.compilation.profile=J2SE-1.4
+javacSource=1.4
+javacTarget=1.4
+ \ No newline at end of file
diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index 3a632d3e20..01861baac2 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -1,16 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<plugin>
-
- <extension
- id="runTests"
- point="org.eclipse.core.runtime.applications">
- <application>
- <run
- class="org.eclipse.cdt.core.suite.RunTests">
- </run>
- </application>
- </extension>
<extension
id="TestProject"
name="C/C++ Test Project"
diff --git a/releng/org.eclipse.cdt.releng/testing/build.properties b/releng/org.eclipse.cdt.releng/testing/build.properties
index c003eb3dd3..0ade4ae3f3 100644
--- a/releng/org.eclipse.cdt.releng/testing/build.properties
+++ b/releng/org.eclipse.cdt.releng/testing/build.properties
@@ -89,7 +89,7 @@ javacDebugInfo=true
javacfailonerror=true
# The version of the source code
-#javaSource=1.3
+javacSource=1.4
# The version of the byte code targeted
-#javacTarget=1.1
+javacTarget=1.4

Back to the top