From 3e674afd516f80cc157b4892d69a2e0b12a5280d Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Fri, 8 Mar 2019 07:50:20 +0100 Subject: Bug 545192 - Convert directory path in docker for windows Change-Id: I69c09d391e333495b57f09d7b7f5818a5428424f Signed-off-by: Hannes Vogt --- launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF | 2 +- .../src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncher.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'launch') 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 b2ec2c9e372..57887039468 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 3b65d0fb914..029bab3eb9d 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(':', '/'); -- cgit v1.2.3