mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-20 22:55:51 +02:00
Code Issues Wiki Activity

Fix Standard Make projects to work

Browse source 
- fix erroneous check in Configuration to use the optionalProps
  variable instead of props
- in ContainerCommandLauncher add the project directory as an
  additional directory so all sources and make macros are
  available to the Container

Change-Id: I13099d246456aa350bebbbae32cc152b3b4598bc
This commit is contained in:
Jeff Johnston 2017-03-14 11:22:42 -04:00
parent db3ee42b31
commit 832347339c
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
View file

@ -264,7 +264,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
buildProperties = new BuildObjectProperties(props, this, this); buildProperties = new BuildObjectProperties(props, this, this);
String optionalProps = SafeStringInterner.safeIntern(element.getAttribute(OPTIONAL_BUILD_PROPERTIES)); String optionalProps = SafeStringInterner.safeIntern(element.getAttribute(OPTIONAL_BUILD_PROPERTIES));
if(props != null) if(optionalProps != null)
optionalBuildProperties = new OptionalBuildProperties(optionalProps); optionalBuildProperties = new OptionalBuildProperties(optionalProps);
String artType = SafeStringInterner.safeIntern(element.getAttribute(BUILD_ARTEFACT_TYPE)); String artType = SafeStringInterner.safeIntern(element.getAttribute(BUILD_ARTEFACT_TYPE));

3
launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerCommandLauncher.java
View file

@ -120,6 +120,9 @@ public class ContainerCommandLauncher
List<String> additionalDirs = new ArrayList<>(); List<String> additionalDirs = new ArrayList<>();
//
additionalDirs.add(fProject.getLocation().toPortableString());
ArrayList<String> commandSegments = new ArrayList<>(); ArrayList<String> commandSegments = new ArrayList<>();
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();