Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2009-05-06 10:41:48 -0400
committerDoug Schaefer2009-05-06 10:41:48 -0400
commit1054b43f5b83428fc33a86b66eccdce785adf389 (patch)
treefd6312fc36444138f02d3776f5bb7b997b9d8314
parentfd490173d10eccafe355fd9a25b8c51d150d173b (diff)
downloadorg.eclipse.cdt-1054b43f5b83428fc33a86b66eccdce785adf389.tar.gz
org.eclipse.cdt-1054b43f5b83428fc33a86b66eccdce785adf389.tar.xz
org.eclipse.cdt-1054b43f5b83428fc33a86b66eccdce785adf389.zip
Fixed up project settings for java 1.5.
-rwxr-xr-xcross/org.eclipse.cdt.build.crossgcc/.classpath14
-rwxr-xr-xcross/org.eclipse.cdt.build.crossgcc/.settings/org.eclipse.jdt.core.prefs16
-rwxr-xr-xcross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java6
3 files changed, 15 insertions, 21 deletions
diff --git a/cross/org.eclipse.cdt.build.crossgcc/.classpath b/cross/org.eclipse.cdt.build.crossgcc/.classpath
index 8a8f1668cd..64c5e31b7a 100755
--- a/cross/org.eclipse.cdt.build.crossgcc/.classpath
+++ b/cross/org.eclipse.cdt.build.crossgcc/.classpath
@@ -1,7 +1,7 @@
-<?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/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?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.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/cross/org.eclipse.cdt.build.crossgcc/.settings/org.eclipse.jdt.core.prefs b/cross/org.eclipse.cdt.build.crossgcc/.settings/org.eclipse.jdt.core.prefs
index f8e6bb7698..2884116de0 100755
--- a/cross/org.eclipse.cdt.build.crossgcc/.settings/org.eclipse.jdt.core.prefs
+++ b/cross/org.eclipse.cdt.build.crossgcc/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
-#Sun Mar 22 23:47:05 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+#Wed May 06 10:39:04 EDT 2009
+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.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java
index 5317421ae5..368e80e408 100755
--- a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java
+++ b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java
@@ -13,7 +13,6 @@ import org.eclipse.core.runtime.Platform;
public class CrossEnvironmentVariableSupplier implements
IConfigurationEnvironmentVariableSupplier {
- @Override
public IBuildEnvironmentVariable getVariable(String variableName,
IConfiguration configuration, IEnvironmentVariableProvider provider) {
if (PathEnvironmentVariable.isVar(variableName))
@@ -22,7 +21,6 @@ public class CrossEnvironmentVariableSupplier implements
return null;
}
- @Override
public IBuildEnvironmentVariable[] getVariables(
IConfiguration configuration, IEnvironmentVariableProvider provider) {
IBuildEnvironmentVariable path = PathEnvironmentVariable.create(configuration);
@@ -53,22 +51,18 @@ public class CrossEnvironmentVariableSupplier implements
: name.equals(PathEnvironmentVariable.name);
}
- @Override
public String getDelimiter() {
return Platform.getOS().equals(Platform.OS_WIN32) ? ";" : ":";
}
- @Override
public String getName() {
return name;
}
- @Override
public int getOperation() {
return IBuildEnvironmentVariable.ENVVAR_PREPEND;
}
- @Override
public String getValue() {
return path.getAbsolutePath();
}

Back to the top