mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-30 20:35:38 +02:00
Code Issues Wiki Activity

Bug 546288 - Docker images for CDT Launchbar builds cannot have a slash

Browse source 
- fix CMakeBuildConfigurationProvider.createBuildConfiguration() to
  massage any image name and replace all slashes with underscores
- do the same for MakefileBuildConfigurationProvider and
  MesonBuildConfigurationProvider

Change-Id: Ib09ade66059533f089084e50cba95d54e9d40547
This commit is contained in:
Jeff Johnston 2019-04-10 15:27:58 -04:00
parent ce60ebbbf6
commit 19e551da58
6 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDT CMake Core
Bundle-SymbolicName: org.eclipse.cdt.cmake.core;singleton:=true
Bundle-Version: 1.2.1.qualifier
Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.eclipse.cdt.cmake.core.internal.Activator
Bundle-Vendor: Eclipse CDT
Require-Bundle: org.eclipse.core.runtime,

1
build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfigurationProvider.java
View file

@ -112,6 +112,7 @@ public class CMakeBuildConfigurationProvider implements ICBuildConfigurationProv
configName.append(launchMode);
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 {

2
build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF
View file

@ -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

1
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java
View file

@ -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 {

2
build/org.eclipse.cdt.meson.core/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.cdt.meson.core;singleton:=true
Bundle-Version: 1.0.1.qualifier
Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.cdt.meson.core.Activator
Bundle-Vendor: %provider
Require-Bundle: org.eclipse.core.runtime,

1
build/org.eclipse.cdt.meson.core/src/org/eclipse/cdt/internal/meson/core/MesonBuildConfigurationProvider.java
View file

@ -115,6 +115,7 @@ public class MesonBuildConfigurationProvider implements ICBuildConfigurationProv
configName.append(launchMode);
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 {