diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2008-12-03 13:53:04 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2008-12-03 13:53:04 +0000 |
| commit | fdc1d3988f84f21c0ade9a11008f2a6eb6a867dc (patch) | |
| tree | e7ec56578d62b3249aaf80a288fd4913b6d47618 /org.rtems.cdt.toolchain2 | |
| parent | Fixed problem due to library access restrictions. (diff) | |
| download | rtems-eclipse-plug-in-fdc1d3988f84f21c0ade9a11008f2a6eb6a867dc.tar.bz2 | |
Fixed path translation issue.
Diffstat (limited to 'org.rtems.cdt.toolchain2')
| -rw-r--r-- | org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java | 3 | ||||
| -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, 9 insertions, 6 deletions
diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java index 7d45944..925f32d 100644 --- a/org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java +++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java @@ -47,7 +47,8 @@ public class Activator extends AbstractUIPlugin { try { out = new BufferedWriter( new FileWriter( makefile.toFile())); out.write( - "include $(" + Constants.BSP_PATH_MAKE_VARIABLE + ")/Makefile.inc\n" + "PROJECT_RELEASE = $(" + Constants.BSP_PATH_MAKE_VARIABLE + ")\n" + + "include $(PROJECT_RELEASE)/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 08ccd04..1a9ea97 100644 --- a/org.rtems.cdt.toolchain2/org/rtems/cdt/Constants.java +++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/Constants.java @@ -15,7 +15,7 @@ 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 BSP_PATH_MAKE_VARIABLE = "ENVIRONMENT_PROJECT_RELEASE"; public static final String DEFAULT_BASE_PATH = "/opt/rtems-4.9"; diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java index 230bd11..2cab79c 100644 --- a/org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java +++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java @@ -18,6 +18,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.LinkedList; import java.util.List; +import java.util.Map; import org.eclipse.cdt.build.core.scannerconfig.CfgInfoContext; import org.eclipse.cdt.build.internal.core.scannerconfig.CfgDiscoveredPathManager; @@ -105,10 +106,11 @@ public class Storage { public static void updateTools( IProject project) { // Create make process builder - ProcessBuilder pb = new ProcessBuilder( - "make", - Constants.BSP_PATH_MAKE_VARIABLE + "=" + getProperty( project, Constants.BSP_PATH_KEY) - ); + ProcessBuilder pb = new ProcessBuilder( "make"); + + // Use environment to pass the BSP path to enable implicit path translation + Map<String, String> env = pb.environment(); + env.put( Constants.BSP_PATH_MAKE_VARIABLE, getProperty( project, Constants.BSP_PATH_KEY)); // Change working directory to the Makefile location pb.directory( Activator.getDefault().getMakefileLocation().toFile()); |