Fix Tycho build for native fragments (#14)

strimo378 · web-flow · commit 7fa852717510 · 2026-01-21T11:28:14.000+01:00
diff --git a/bundles/com.emmtrix.isl.core/META-INF/MANIFEST.MF b/bundles/com.emmtrix.isl.core/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ISL Core Bundle
+Bundle-SymbolicName: com.emmtrix.isl.core
+Bundle-Version: 0.1.0.qualifier
+Bundle-Vendor: Emmtrix
+Export-Package: com.emmtrix.isl.core
diff --git a/bundles/com.emmtrix.isl.core/build.properties b/bundles/com.emmtrix.isl.core/build.properties
@@ -0,0 +1,3 @@
+source.. = src/main/java/
+output.. = target/classes/
+bin.includes = META-INF/,.
diff --git a/bundles/com.emmtrix.isl.core/pom.xml b/bundles/com.emmtrix.isl.core/pom.xml
@@ -12,7 +12,7 @@
   </parent>
 
   <artifactId>com.emmtrix.isl.core</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>eclipse-plugin</packaging>
   <name>ISL Core Bundle</name>
 
   <build>
diff --git a/bundles/com.emmtrix.isl.jni/META-INF/MANIFEST.MF b/bundles/com.emmtrix.isl.jni/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ISL JNI Bundle
+Bundle-SymbolicName: com.emmtrix.isl.jni
+Bundle-Version: 0.1.0.qualifier
+Bundle-Vendor: Emmtrix
diff --git a/bundles/com.emmtrix.isl.jni/build.properties b/bundles/com.emmtrix.isl.jni/build.properties
@@ -0,0 +1,2 @@
+bin.includes = META-INF/,
+               .
diff --git a/bundles/com.emmtrix.isl.jni/pom.xml b/bundles/com.emmtrix.isl.jni/pom.xml
@@ -12,7 +12,7 @@
   </parent>
 
   <artifactId>com.emmtrix.isl.jni</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>eclipse-plugin</packaging>
   <name>ISL JNI Bundle</name>
 
   <build>
diff --git a/bundles/com.emmtrix.isl.native.linux.x86_64/META-INF/MANIFEST.MF b/bundles/com.emmtrix.isl.native.linux.x86_64/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ISL Native Fragment (linux x86_64)
+Bundle-SymbolicName: com.emmtrix.isl.native.linux.x86_64
+Bundle-Version: 0.1.0.qualifier
+Bundle-Vendor: Emmtrix
+Fragment-Host: com.emmtrix.isl.jni
+Bundle-NativeCode: native/linux/x86_64/libisl_wrapper.so;osname=linux;
+ processor=x86_64
diff --git a/bundles/com.emmtrix.isl.native.linux.x86_64/build.properties b/bundles/com.emmtrix.isl.native.linux.x86_64/build.properties
@@ -0,0 +1,2 @@
+bin.includes = META-INF/,
+               native/
diff --git a/bundles/com.emmtrix.isl.native.linux.x86_64/pom.xml b/bundles/com.emmtrix.isl.native.linux.x86_64/pom.xml
@@ -12,12 +12,21 @@
   </parent>
 
   <artifactId>com.emmtrix.isl.native.linux.x86_64</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>eclipse-plugin</packaging>
   <name>ISL Native Fragment (linux x86_64)</name>
 
   <build>
     <plugins>
       <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <executions>
+          <execution>
+            <id>default-validate-classpath</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <version>${maven.bundle.plugin.version}</version>
diff --git a/bundles/com.emmtrix.isl.native.linux.x86_64/src/main/resources/native/linux/x86_64/libisl_wrapper.so b/bundles/com.emmtrix.isl.native.linux.x86_64/src/main/resources/native/linux/x86_64/libisl_wrapper.so
@@ -0,0 +1,2 @@
+This is a placeholder for the Linux native JNI library.
+Build native artifacts with CMake to replace this file.
diff --git a/bundles/com.emmtrix.isl.native.macosx.aarch64/META-INF/MANIFEST.MF b/bundles/com.emmtrix.isl.native.macosx.aarch64/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ISL Native Fragment (macosx aarch64)
+Bundle-SymbolicName: com.emmtrix.isl.native.macosx.aarch64
+Bundle-Version: 0.1.0.qualifier
+Bundle-Vendor: Emmtrix
+Fragment-Host: com.emmtrix.isl.jni
+Bundle-NativeCode: native/macosx/aarch64/libisl_wrapper.dylib;osname=macosx;
+ processor=aarch64
diff --git a/bundles/com.emmtrix.isl.native.macosx.aarch64/build.properties b/bundles/com.emmtrix.isl.native.macosx.aarch64/build.properties
@@ -0,0 +1,2 @@
+bin.includes = META-INF/,
+               native/
diff --git a/bundles/com.emmtrix.isl.native.macosx.aarch64/pom.xml b/bundles/com.emmtrix.isl.native.macosx.aarch64/pom.xml
@@ -12,12 +12,21 @@
   </parent>
 
   <artifactId>com.emmtrix.isl.native.macosx.aarch64</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>eclipse-plugin</packaging>
   <name>ISL Native Fragment (macosx aarch64)</name>
 
   <build>
     <plugins>
       <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <executions>
+          <execution>
+            <id>default-validate-classpath</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <version>${maven.bundle.plugin.version}</version>
diff --git a/bundles/com.emmtrix.isl.native.macosx.aarch64/src/main/resources/native/macosx/aarch64/libisl_wrapper.dylib b/bundles/com.emmtrix.isl.native.macosx.aarch64/src/main/resources/native/macosx/aarch64/libisl_wrapper.dylib
@@ -0,0 +1,2 @@
+This is a placeholder for the macOS native JNI library.
+Build native artifacts with CMake to replace this file.
diff --git a/bundles/com.emmtrix.isl.native.win32.x86_64/META-INF/MANIFEST.MF b/bundles/com.emmtrix.isl.native.win32.x86_64/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ISL Native Fragment (win32 x86_64)
+Bundle-SymbolicName: com.emmtrix.isl.native.win32.x86_64
+Bundle-Version: 0.1.0.qualifier
+Bundle-Vendor: Emmtrix
+Fragment-Host: com.emmtrix.isl.jni
+Bundle-NativeCode: native/win32/x86_64/isl_wrapper.dll;osname=win32;
+ processor=x86_64
diff --git a/bundles/com.emmtrix.isl.native.win32.x86_64/build.properties b/bundles/com.emmtrix.isl.native.win32.x86_64/build.properties
@@ -0,0 +1,2 @@
+bin.includes = META-INF/,
+               native/
diff --git a/bundles/com.emmtrix.isl.native.win32.x86_64/pom.xml b/bundles/com.emmtrix.isl.native.win32.x86_64/pom.xml
@@ -12,12 +12,21 @@
   </parent>
 
   <artifactId>com.emmtrix.isl.native.win32.x86_64</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>eclipse-plugin</packaging>
   <name>ISL Native Fragment (win32 x86_64)</name>
 
   <build>
     <plugins>
       <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <executions>
+          <execution>
+            <id>default-validate-classpath</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <version>${maven.bundle.plugin.version}</version>
diff --git a/bundles/com.emmtrix.isl.native.win32.x86_64/src/main/resources/native/win32/x86_64/isl_wrapper.dll b/bundles/com.emmtrix.isl.native.win32.x86_64/src/main/resources/native/win32/x86_64/isl_wrapper.dll
@@ -0,0 +1,2 @@
+This is a placeholder for the Windows native JNI library.
+Build native artifacts with CMake to replace this file.
diff --git a/pom.xml b/pom.xml
@@ -39,6 +39,14 @@
         <version>${tycho.version}</version>
         <extensions>true</extensions>
       </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <pomDependencies>wrapAsBundle</pomDependencies>
+        </configuration>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+source.. = src/main/java/`
	`2`	`+output.. = target/classes/`
	`3`	`+bin.includes = META-INF/,.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+bin.includes = META-INF/,`
	`2`	`+ native/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+This is a placeholder for the Linux native JNI library.`
	`2`	`+Build native artifacts with CMake to replace this file.`