Changeset fdc1d39 in rtems-eclipse-plug-in


Ignore:
Timestamp:
Dec 3, 2008, 1:53:04 PM (10 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
c1a000b
Parents:
8c274a7
Message:

Fixed path translation issue.

Location:
org.rtems.cdt.toolchain2/org/rtems/cdt
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java

    r8c274a7 rfdc1d39  
    4848                        out = new BufferedWriter( new FileWriter( makefile.toFile()));
    4949                        out.write(
    50                                 "include $(" + Constants.BSP_PATH_MAKE_VARIABLE + ")/Makefile.inc\n"
     50                                "PROJECT_RELEASE = $(" + Constants.BSP_PATH_MAKE_VARIABLE + ")\n"
     51                                        + "include $(PROJECT_RELEASE)/Makefile.inc\n"
    5152                                        + "include $(RTEMS_CUSTOM)\n"
    5253                                        + "include $(PROJECT_ROOT)/make/leaf.cfg\n"
  • org.rtems.cdt.toolchain2/org/rtems/cdt/Constants.java

    r8c274a7 rfdc1d39  
    1616        public static final String PATH_SEPERATOR = System.getProperty( "path.separator");
    1717       
    18         public static final String BSP_PATH_MAKE_VARIABLE = "PROJECT_RELEASE";
     18        public static final String BSP_PATH_MAKE_VARIABLE = "ENVIRONMENT_PROJECT_RELEASE";
    1919       
    2020        public static final String DEFAULT_BASE_PATH = "/opt/rtems-4.9";
  • org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java

    r8c274a7 rfdc1d39  
    1919import java.util.LinkedList;
    2020import java.util.List;
     21import java.util.Map;
    2122
    2223import org.eclipse.cdt.build.core.scannerconfig.CfgInfoContext;
     
    106107        public static void updateTools( IProject project) {
    107108                // Create make process builder
    108                 ProcessBuilder pb = new ProcessBuilder(
    109                         "make",
    110                         Constants.BSP_PATH_MAKE_VARIABLE + "=" + getProperty( project, Constants.BSP_PATH_KEY)
    111                 );
     109                ProcessBuilder pb = new ProcessBuilder( "make");
     110               
     111                // Use environment to pass the BSP path to enable implicit path translation
     112                Map<String, String> env = pb.environment();
     113                env.put( Constants.BSP_PATH_MAKE_VARIABLE, getProperty( project, Constants.BSP_PATH_KEY));
    112114               
    113115                // Change working directory to the Makefile location
Note: See TracChangeset for help on using the changeset viewer.