diff options
| author | Jeff Johnston | 2019-04-10 19:27:58 +0000 |
|---|---|---|
| committer | Jeff Johnston | 2019-04-10 19:49:08 +0000 |
| commit | 19e551da58b5424132551bcf61e00d5d6b82e1c6 (patch) | |
| tree | 1286f1e8cae572e5329cefd81a6c16050ee10bc0 /build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make | |
| parent | ce60ebbbf6ce252c4acd2408cee70ac57f42b424 (diff) | |
| download | org.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/src/org/eclipse/cdt/make')
| -rw-r--r-- | build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 9a318d5c8ce..1b12ceeb1d3 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 { |