#37 add support for 'lib' classpath entries

Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>

tycho-core/src/main/java/org/eclipse/tycho/core/dotClasspath/ClasspathParser.java

@@ -104,6 +104,9 @@ public synchronized Collection<ProjectClasspathEntry> getEntries() throws IOExce
  } else {
  list.add(new JDTContainerClasspathEntry(path, attributes));
  }
+ } else if ("lib".equals(kind)) {
+ String path = classpathentry.getAttribute("path");
+ list.add(new JDTLibraryClasspathEntry(new File(file.getParentFile(), path), attributes));
  }
  }
  entries = Collections.unmodifiableList(list);
@@ -216,9 +219,9 @@ public String getContainerPath() {
 
  private static final class JDTSourceFolder implements SourceFolderClasspathEntry {
 
- private File path;
- private Map<String, String> attributes;
- private File output;
+ private final File path;
+ private final Map<String, String> attributes;
+ private final File output;
 
  public JDTSourceFolder(File path, File output, Map<String, String> attributes) {
  this.path = path;
@@ -243,4 +246,26 @@ public Map<String, String> getAttributes() {
 
  }
 
+ private static final class JDTLibraryClasspathEntry implements LibraryClasspathEntry {
+
+ private final File path;
+ private final Map<String, String> attributes;
+
+ public JDTLibraryClasspathEntry(File path, Map<String, String> attributes) {
+ this.path = path;
+ this.attributes = attributes;
+ }
+
+ @Override
+ public Map<String, String> getAttributes() {
+ return attributes;
+ }
+
+ @Override
+ public File getLibraryPath() {
+ return path;
+ }
+
+ }
+
 }

tycho-core/src/main/java/org/eclipse/tycho/core/dotClasspath/LibraryClasspathEntry.java

@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2021 Christoph Läubrich and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Christoph Läubrich - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tycho.core.dotClasspath;
+
+import java.io.File;
+
+public interface LibraryClasspathEntry extends ProjectClasspathEntry {
+
+ /**
+ * 
+ * @return the library path name
+ */
+ File getLibraryPath();
+
+}

tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java

@@ -59,6 +59,7 @@
 import org.eclipse.tycho.core.TychoProject;
 import org.eclipse.tycho.core.dotClasspath.ClasspathParser;
 import org.eclipse.tycho.core.dotClasspath.JUnitClasspathContainerEntry;
+import org.eclipse.tycho.core.dotClasspath.LibraryClasspathEntry;
 import org.eclipse.tycho.core.dotClasspath.ProjectClasspathEntry;
 import org.eclipse.tycho.core.ee.ExecutionEnvironmentUtils;
 import org.eclipse.tycho.core.ee.StandardExecutionEnvironment;
@@ -478,6 +479,13 @@ private void addExtraClasspathEntries(List<ClasspathEntry> classpath, ReactorPro
  }
  }
  }
+ for (ProjectClasspathEntry entry : pdeProject.getClasspathEntries()) {
+ if (entry instanceof LibraryClasspathEntry) {
+ LibraryClasspathEntry libraryClasspathEntry = (LibraryClasspathEntry) entry;
+ ArtifactKey projectKey = getArtifactKey(project);
+ classpath.add(new DefaultClasspathEntry(project, projectKey, Collections.singletonList(libraryClasspathEntry.getLibraryPath()), null));
+ }
+ }
  }
 
  protected DefaultClasspathEntry addBundleToClasspath(ArtifactDescriptor matchingBundle, String path) {

tycho-its/projects/compiler.libentry/my.bundle/.classpath

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="module" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="lib" path="lib/osgi.annotation-7.0.0.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>

tycho-its/projects/compiler.libentry/my.bundle/META-INF/MANIFEST.MF

@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: My Bundle
+Bundle-SymbolicName: my.bundle
+Bundle-Version: 1.0.0.qualifier
+Automatic-Module-Name: my.bundle
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: my.bundle;version="1.0.0"

tycho-its/projects/compiler.libentry/my.bundle/build.properties

@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .

tycho-its/projects/compiler.libentry/my.bundle/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>my.bundle</artifactId>
+ <groupId>org.eclipse.tycho.it</groupId>
+ <packaging>eclipse-plugin</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+</project>

tycho-its/projects/compiler.libentry/my.bundle/src/my/bundle/SampleClass1.java

@@ -0,0 +1,7 @@
+package my.bundle;
+
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
+public interface SampleClass1 {
+}

tycho-its/projects/compiler.libentry/my.bundle/src/my/bundle/package-info.java

@@ -0,0 +1,4 @@
+@Version("1.0.0")
+package my.bundle;
+
+import org.osgi.annotation.versioning.Version;

tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerJunitContainerTest.java → tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java

@@ -16,12 +16,18 @@
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;
 
-public class CompilerJunitContainerTest extends AbstractTychoIntegrationTest {
+public class CompilerClasspathEntryTest extends AbstractTychoIntegrationTest {
 
  @Test
  public void testJUnit4Container() throws Exception {
  Verifier verifier = getVerifier("compiler.junitcontainer/junit4-in-bundle", true);
  verifier.executeGoal("test");
  verifier.verifyErrorFreeLog();
  }
+
+ public void testLibEntry() throws Exception {
+ Verifier verifier = getVerifier("compiler.libentry/my.bundle", false);
+ verifier.executeGoal("compile");
+ verifier.verifyErrorFreeLog();
+ }
 }