Use target platform as file

Since Tycho 2.3 a target platform can be referenced as file, it does not need to be built as an artifact. Signed-off-by: Michael Keppler <[email protected]>
eclipse-elk · Jan 2, 2025 · bf5b212 · bf5b212
1 parent c213da5
commit bf5b212
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 38 deletions.
diff --git a/build/org.eclipse.elk.targetplatform/pom.xml b/build/org.eclipse.elk.targetplatform/pom.xml
diff --git a/build/pom.xml b/build/pom.xml
@@ -62,7 +62,6 @@
       <id>elk-meta</id>
 
       <modules>
-        <module>org.eclipse.elk.targetplatform</module>
         <module>../plugins/org.eclipse.elk.graph</module>
         <module>../plugins/org.eclipse.elk.core.meta</module>
       </modules>
@@ -177,6 +176,11 @@
               <version>${elk-version}</version>
             </artifact>
           </target>
+          <target>
+            <!-- Replace multi module dir by basedir after Tycho 3.0+ can be used.
+                 see https://github.com/eclipse-tycho/tycho/issues/1660 -->
+            <file>${maven.multiModuleProjectDirectory}/org.eclipse.elk.targetplatform/org.eclipse.elk.targetplatform.target</file>
+          </target>
           <environments>
             <environment>
               <os>win32</os>

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -23,7 +23,6 @@
 
   <!-- all plugins need to be listed as module -->
   <modules>
-    <module>../build/org.eclipse.elk.targetplatform</module>
     <module>org.eclipse.elk.alg.common</module>
     <module>org.eclipse.elk.alg.disco</module>
     <module>org.eclipse.elk.alg.disco.debug</module>