diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2008-12-03 08:46:31 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2008-12-03 08:46:31 +0000 |
| commit | 22039d525cf496679f3bc4afabab04ee7b71997d (patch) | |
| tree | 20687368074f0dc868f9761589da6305bf679363 | |
| parent | Cleanup. (diff) | |
| download | rtems-eclipse-plug-in-22039d525cf496679f3bc4afabab04ee7b71997d.tar.bz2 | |
Fixed issue with copied BSP installations.
| -rw-r--r-- | org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java | 2 | ||||
| -rw-r--r-- | org.rtems.cdt.toolchain2/org/rtems/cdt/Constants.java | 2 | ||||
| -rw-r--r-- | org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java index f583b1a..7d45944 100644 --- a/org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java +++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java @@ -47,7 +47,7 @@ public class Activator extends AbstractUIPlugin { try { out = new BufferedWriter( new FileWriter( makefile.toFile())); out.write( - "include $(RTEMS_MAKEFILE_PATH)/Makefile.inc\n" + "include $(" + Constants.BSP_PATH_MAKE_VARIABLE + ")/Makefile.inc\n" + "include $(RTEMS_CUSTOM)\n" + "include $(PROJECT_ROOT)/make/leaf.cfg\n" + "all:\n" diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/Constants.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/Constants.java index afb7bc1..08ccd04 100644 --- a/org.rtems.cdt.toolchain2/org/rtems/cdt/Constants.java +++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/Constants.java @@ -15,6 +15,8 @@ package org.rtems.cdt; public class Constants { public static final String PATH_SEPERATOR = System.getProperty( "path.separator"); + public static final String BSP_PATH_MAKE_VARIABLE = "PROJECT_RELEASE"; + public static final String DEFAULT_BASE_PATH = "/opt/rtems-4.9"; public static final String DEFAULT_BSP_PATH = "/opt/rtems-4.9/powerpc-rtems4.9/psim"; diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java index 9826b00..3cd0c0e 100644 --- a/org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java +++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java @@ -18,7 +18,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.LinkedList; import java.util.List; -import java.util.Map; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -78,11 +77,10 @@ public class Storage { public static void updateTools( IProject project) { // Create make process builder - ProcessBuilder pb = new ProcessBuilder( "make"); - - // Provide RTEMS_MAKEFILE_PATH environment variable - Map<String, String> env = pb.environment(); - env.put( "RTEMS_MAKEFILE_PATH", getProperty( project, Constants.BSP_PATH_KEY)); + ProcessBuilder pb = new ProcessBuilder( + "make", + Constants.BSP_PATH_MAKE_VARIABLE + "=" + getProperty( project, Constants.BSP_PATH_KEY) + ); // Change working directory to the Makefile location pb.directory( Activator.getDefault().getMakefileLocation().toFile()); |