Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2019-04-10 15:27:58 -0400
committerJeff Johnston2019-04-10 15:49:08 -0400
commit19e551da58b5424132551bcf61e00d5d6b82e1c6 (patch)
tree1286f1e8cae572e5329cefd81a6c16050ee10bc0 /build/org.eclipse.cdt.make.core
parentce60ebbbf6ce252c4acd2408cee70ac57f42b424 (diff)
downloadorg.eclipse.cdt-19e551da58b5424132551bcf61e00d5d6b82e1c6.tar.gz
org.eclipse.cdt-19e551da58b5424132551bcf61e00d5d6b82e1c6.tar.xz
org.eclipse.cdt-19e551da58b5424132551bcf61e00d5d6b82e1c6.zip
Bug 546288 - Docker images for CDT Launchbar builds cannot have a slash
- fix CMakeBuildConfigurationProvider.createBuildConfiguration() to massage any image name and replace all slashes with underscores - do the same for MakefileBuildConfigurationProvider and MesonBuildConfigurationProvider Change-Id: Ib09ade66059533f089084e50cba95d54e9d40547
Diffstat (limited to 'build/org.eclipse.cdt.make.core')
-rw-r--r--build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF2
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF
index 1356ee5361..7fbd8d4bdf 100644
--- a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.make.core; singleton:=true
-Bundle-Version: 7.4.1.qualifier
+Bundle-Version: 7.4.2.qualifier
Bundle-Activator: org.eclipse.cdt.make.core.MakeCorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java
index 9a318d5c8c..1b12ceeb1d 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java
@@ -80,6 +80,7 @@ public class MakefileBuildConfigurationProvider implements ICBuildConfigurationP
String os = toolChain.getProperty(IToolChain.ATTR_OS);
if ("linux-container".equals(os)) { //$NON-NLS-1$
String osConfigName = toolChain.getProperty("linux-container-id"); //$NON-NLS-1$
+ osConfigName = osConfigName.replaceAll("/", "_"); //$NON-NLS-1$ //$NON-NLS-2$
configName.append('.');
configName.append(osConfigName);
} else {

Back to the top