From 832347339cc0a73ab9e886977e0273869d03f80b Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 14 Mar 2017 11:22:42 -0400 Subject: [PATCH] Fix Standard Make projects to work - 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 --- .../cdt/managedbuilder/internal/core/Configuration.java | 2 +- .../cdt/internal/docker/launcher/ContainerCommandLauncher.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java index ac7b3f22ae8..03f14a6256c 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java @@ -264,7 +264,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild buildProperties = new BuildObjectProperties(props, this, this); String optionalProps = SafeStringInterner.safeIntern(element.getAttribute(OPTIONAL_BUILD_PROPERTIES)); - if(props != null) + if(optionalProps != null) optionalBuildProperties = new OptionalBuildProperties(optionalProps); String artType = SafeStringInterner.safeIntern(element.getAttribute(BUILD_ARTEFACT_TYPE)); diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerCommandLauncher.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerCommandLauncher.java index 660d0baf3d1..0c0020d2cee 100644 --- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerCommandLauncher.java +++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerCommandLauncher.java @@ -120,6 +120,9 @@ public class ContainerCommandLauncher List additionalDirs = new ArrayList<>(); + // + additionalDirs.add(fProject.getLocation().toPortableString()); + ArrayList commandSegments = new ArrayList<>(); StringBuilder b = new StringBuilder();