Fix #652 - Nested target feature needs to support windows path in

project_loc expansion Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>
eclipse-tycho · Feb 15, 2022 · 89ef155 · 89ef155
1 parent c543cdf
commit 89ef155
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/...ver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TargetDefinitionResolverTest.java b/...ver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TargetDefinitionResolverTest.java
@@ -15,10 +15,14 @@
 
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -32,7 +36,6 @@
 import org.eclipse.equinox.p2.metadata.VersionedId;
 import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.tycho.core.resolver.shared.IncludeSourceMode;
-import org.eclipse.tycho.core.shared.BuildFailureException;
 import org.eclipse.tycho.core.shared.MockMavenContext;
 import org.eclipse.tycho.core.shared.TargetEnvironment;
 import org.eclipse.tycho.p2.impl.test.ResourceUtil;
@@ -95,6 +98,18 @@ static List<TargetEnvironment> defaultEnvironments() {
         return Collections.singletonList(new TargetEnvironment(null, null, null));
     }
 
+    @Test
+    public void testURI() throws URISyntaxException, MalformedURLException {
+        String uri = TargetDefinitionResolver
+                .convertRawToUri("file:C:\\ws\\target-testcase\\tycho\\target.references\\target.refs/base.target");
+        //check that it has the missing / infront of the protocol
+        assertTrue(uri + " does not start with file:/", uri.startsWith("file:/"));
+        //check that this could be parsed as an URI afterwards
+        URI parsed = new URI(uri);
+        parsed.toURL();
+
+    }
+
     @Test
     public void testResolveNoLocations() throws Exception {
         TargetDefinition definition = definitionWith();

diff --git a/....p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/....p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
@@ -199,7 +199,7 @@ TargetDefinitionContent resolveContentWithExceptions(TargetDefinition definition
                 String resolvePath = resolvePath(referenceLocation.getUri(), definition);
                 URI resolvedUri;
                 try {
-                    resolvedUri = new URI(resolvePath);
+                    resolvedUri = new URI(convertRawToUri(resolvePath));
                 } catch (URISyntaxException e) {
                     throw new ResolverException("Invalid URI " + resolvePath + ": " + e.getMessage(), e);
                 }
@@ -274,6 +274,17 @@ public IArtifactRepository getArtifactRepository() {
         };
     }
 
+    static String convertRawToUri(String resolvePath) {
+        //We need to convert windows path separators here...
+        resolvePath = resolvePath.replace('\\', '/');
+        String lc = resolvePath.toLowerCase();
+        if (lc.startsWith("file:") && !lc.startsWith("file:/")) {
+            //according to rfc a file URI must always start with a slash
+            resolvePath = resolvePath.replaceFirst("(?i)^file:", "file:/");
+        }
+        return resolvePath;
+    }
+
     protected String resolvePath(String path, TargetDefinition definition) {
         path = resolvePattern(path, SYSTEM_PROPERTY_PATTERN,
                 key -> mavenContext.getSessionProperties().getProperty(key, ""));