Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannes Vogt2019-03-08 01:50:20 -0500
committerJeff Johnston2019-03-20 11:36:39 -0400
commit3e674afd516f80cc157b4892d69a2e0b12a5280d (patch)
tree6a4777bfbfc8e03ed9a262978532f9c7fd0a8de1
parentd84e61890def857082030ce5bcf17131f0d3f5bb (diff)
downloadorg.eclipse.cdt-3e674afd516f80cc157b4892d69a2e0b12a5280d.tar.gz
org.eclipse.cdt-3e674afd516f80cc157b4892d69a2e0b12a5280d.tar.xz
org.eclipse.cdt-3e674afd516f80cc157b4892d69a2e0b12a5280d.zip
Bug 545192 - Convert directory path in docker for windows
Change-Id: I69c09d391e333495b57f09d7b7f5818a5428424f Signed-off-by: Hannes Vogt <hannes@havogt.de>
-rw-r--r--launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF2
-rw-r--r--launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncher.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF
index b2ec2c9e37..5788703946 100644
--- a/launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF
+++ b/launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.cdt.docker.launcher;singleton:=true
-Bundle-Version: 1.2.100.qualifier
+Bundle-Version: 1.2.200.qualifier
Bundle-Activator: org.eclipse.cdt.docker.launcher.DockerLaunchUIPlugin
Bundle-Vendor: %Plugin.vendor
Bundle-Localization: plugin
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncher.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncher.java
index 3b65d0fb91..029bab3eb9 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncher.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncher.java
@@ -187,7 +187,7 @@ public class ContainerCommandLauncher implements ICommandLauncher, ICBuildComman
String modifiedArg = realArg;
// if the directory of the arg as a file exists, we mount it
// and modify the argument to be unix-style
- if (f.isFile()) {
+ if (f.isFile() || f.isDirectory()) {
f = f.getParentFile();
modifiedArg = "/" //$NON-NLS-1$
+ p.toPortableString().replace(':', '/');

Back to the top