Feature/use panama

.github/workflows/publish.yml

@@ -13,14 +13,17 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
       - name: Build and publish with Gradle
         run: |
           cd ./klang
-          ./gradlew build publish --info
+          ./gradlew publishAll --info
         env:
           VERSION: ${{ github.event.release.tag_name }}
-          URL: ${{ vars.GITLAB_URL }}
-          TOKEN: ${{ secrets.GITLAB_TOKEN }}
+          SONATYPE_LOGIN: ${{ secrets.SONATYPE_LOGIN }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          PGP_PUBLIC: ${{ secrets.PGP_PUBLIC }}
+          PGP_PRIVATE: ${{ secrets.PGP_PRIVATE }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
 

.github/workflows/test.yml

@@ -13,24 +13,35 @@ concurrency:
 jobs:
   tests:
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [macos-14, ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: print architecture
+        run: uname -m
       - uses: actions/checkout@v3
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
       - name: Cache Gradle packages
         uses: actions/cache@v3
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
-      - name: Build & test klang
+      - name: Build & test klang macos
+        if: matrix.os == 'macos-14'
+        run: |
+          cd ./klang
+          ./gradlew test
+      - name: Build & test klang ubuntu
+        if: matrix.os == 'ubuntu-latest'
+        env:
+          LIBCLANG_PATH: "/usr/lib/llvm-15/lib/libclang-15.so.1"
         run: |
           cd ./klang
           ./gradlew test

.gitignore

@@ -21,3 +21,9 @@ gradle-app.setting
 .classpath
 /.idea/
 /toolkit/*.log
+
+# Ignore native libraries
+*.dll
+*.dylib
+*.so
+*.jar

README.md

@@ -1 +1,42 @@
-Experimental toolkit to auto generate binding from C/C++/Objective C library to Kotlin 
+# Klang Toolkit
+
+*Experimental toolkit to generate bindings from C/C++/Objective-C library to Kotlin using Clang.*
+
+## Status Overview
+
+Currently, we are in the experimental phase of parsing headers. We have two main approaches:
+
+### Approach 1: Standalone LibClang 15 Library
+
+- **Advantages**
+    - More accurate header parsing.
+- **Disadvantages**
+    - LibClang is part of the LLVM toolchain.
+
+### Approach 2: Clang 15 from Docker for JSON AST Generation
+
+- **Advantages**
+    - Easier to use.
+- **Disadvantages**
+    - Limited information on JSON AST.
+    - Requires Docker on host for JSON AST generation.
+    - Hard to use OS-specific headers.
+
+We can generate a good enough binding with JNA on a C library. Check the `bindings` folder for examples.
+
+## Known Issues
+
+Currently, with Gradle, the native library is loaded multiple times on the daemon. Therefore, the Klang plugin does not
+support the Gradle daemon.
+
+## Additional Information
+
+The `Jextract` code is embedded almost as is, and the license may differ from Klang toolkit.
+
+This project embeds C headers from different sources; namely:
+
+1. `/klang/src/main/resource/darwin-headers.zip` is obtained from XCode. Refer to `/usr/bin/xcrun --show-sdk-path`.
+2. `/klang/src/main/resource/c-headers.zip` is obtained from Clang 15 headers.
+
+Clang dynamic libraries (version 15) are embedded. These are fetched
+from [prebuilt version on GitHub](https://github.com/klang-toolkit/libclang-binary/releases/tag/15).

bindings/angle/binaries/build.gradle.kts

@@ -0,0 +1,34 @@
+import org.jetbrains.kotlin.de.undercouch.gradle.tasks.download.Download
+
+plugins {
+	kotlin("jvm") version libs.versions.kotlin
+	`maven-publish`
+}
+
+publishing {
+	publications {
+		create<MavenPublication>("mavenJava") { from(components["java"]) }
+	}
+}
+version = "chrome-122.0.6261"
+
+val directory = project.file("src/main/resources")
+val baseUrl = "https://github.com/klang-toolkit/ANGLE-binary/releases/download/$version/"
+val fileToDownload = listOf(
+	"libEGL.dylib" to directory.resolve("darwin").resolve("libEGL.dylib"),
+	"libGLESv2.dylib" to directory.resolve("darwin").resolve("libGLESv2.dylib"),
+	"libEGL.dll" to directory.resolve("win32").resolve("libEGL.dylib"),
+	"libGLESv2.dll" to directory.resolve("win32").resolve("libGLESv2.dylib"),
+).forEach { (fileName, target) ->
+	val url = "$baseUrl$fileName"
+	val taskName = "downloadFile-$fileName"
+	tasks.register<Download>(taskName) {
+		onlyIf { !target.exists() }
+		src(url)
+		dest(target)
+	}
+
+	tasks.named("processResources") {
+		dependsOn(taskName)
+	}
+}

bindings/angle/build.gradle.kts

@@ -1,14 +1,59 @@
 
+plugins {
+	kotlin("jvm") version libs.versions.kotlin
+	id("com.gradle.plugin-publish") version "1.0.0"
+}
+
+repositories {
+	mavenCentral()
+}
 
+group = "io.ygdrasil"
+version = "1.0.0-SNAPSHOT"
 
-allprojects {
+subprojects {
+	apply(plugin = "maven-publish")
+	apply(plugin = "org.jetbrains.kotlin.jvm")
 
     repositories {
         mavenCentral()
     }
 
 	group = "io.ygdrasil"
 	version = "1.0.0-SNAPSHOT"
+
+	publishing {
+
+		publications {
+			create<MavenPublication>("maven") {
+				from(components["java"])
+
+				pom {
+					name = "Klang-${project.name}"
+					description = "Angle binding"
+					url = "https://ygdrasil.io/"
+					licenses {
+						license {
+							name = "MIT"
+							url = "https://opensource.org/license/mit/"
+						}
+					}
+					developers {
+						developer {
+							id = "alexandremo"
+							name = "Alexandre Mommers"
+							email = "alexandre dot mommers at gmail do com"
+						}
+					}
+					scm {
+						connection = "scm:git:git://github.com/ygdrasil-io/klang.git"
+						developerConnection = "scm:git:ssh//[email protected]:ygdrasil-io/klang.git"
+						url = "https://github.com/ygdrasil-io/klang"
+					}
+				}
+			}
+		}
+	}
 }
 
 

bindings/angle/example/build.gradle.kts

@@ -1,6 +1,6 @@
 
 plugins {
-	kotlin("jvm") version "1.9.10"
+	kotlin("jvm") version libs.versions.kotlin
 }
 
 dependencies {

bindings/angle/example/src/main/kotlin/example/HelloTriangle.kt

@@ -52,16 +52,16 @@ class HelloTriangle : SampleApplication("HelloTriangle") {
 		libGLESv2Library.glViewport(0, 0, window.width, window.height)
 
 		// Clear the color buffer
-		libGLESv2Library.glClear(GL_COLOR_BUFFER_BIT)
+		libGLESv2Library.glClear(GL_COLOR_BUFFER_BIT.toInt())
 
 		// Use the program object
 		libGLESv2Library.glUseProgram(mProgram)
 
 		// Load the vertex data
-		libGLESv2Library.glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE.toByte(), 0, verticesBuffer)
+		libGLESv2Library.glVertexAttribPointer(0, 3, GL_FLOAT.toInt(), GL_FALSE.toByte(), 0, verticesBuffer)
 		libGLESv2Library.glEnableVertexAttribArray(0)
 
-		libGLESv2Library.glDrawArrays(GL_TRIANGLES, 0, 3)
+		libGLESv2Library.glDrawArrays(GL_TRIANGLES.toInt(), 0, 3)
 	}
 
 }

bindings/angle/example/src/main/kotlin/example/toolkit/EGLPlatformParameters.kt

@@ -1,28 +1,23 @@
 package example.toolkit
 
-import libangle.EGL_DONT_CARE
-import libangle.EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE
-import libangle.EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE
-import libangle.Feature
+import libangle.*
 import java.util.*
 
 class PlatformMethods
 
 class EGLPlatformParameters {
 	var renderer: Int = EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE
-	var majorVersion: Int = EGL_DONT_CARE
-	var minorVersion: Int = EGL_DONT_CARE
+	var majorVersion: Int = EGL_DONT_CARE.toInt()
+	var minorVersion: Int = EGL_DONT_CARE.toInt()
 	var deviceType: Int = EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE
-	var presentPath: Int = EGL_DONT_CARE
-	var debugLayersEnabled: Int = EGL_DONT_CARE
-	var robustness: Int = EGL_DONT_CARE
-	var displayPowerPreference: Int = EGL_DONT_CARE
+	var presentPath: Int = EGL_DONT_CARE.toInt()
+	var debugLayersEnabled: Int = EGL_DONT_CARE.toInt()
+	var robustness: Int = EGL_DONT_CARE.toInt()
+	var displayPowerPreference: Int = EGL_DONT_CARE.toInt()
 	var enabledFeatureOverrides: MutableList<Feature> = ArrayList()
 	var disabledFeatureOverrides: MutableList<Feature> = ArrayList()
 	var platformMethods: PlatformMethods? = null
-
 	constructor() // Constructor por defecto
-
 	constructor(renderer: Int) {
 		this.renderer = renderer
 	}

bindings/angle/example/src/main/kotlin/example/toolkit/EGLWindow.kt

@@ -31,28 +31,7 @@ class EGLWindow(window: OSWindow) {
 	}
 
 	fun initializeDisplay(osWindow: OSWindow, glWindowingLibrary: Library, driverType: GLESDriverType, params: EGLPlatformParameters): Boolean {
-		if (driverType == GLESDriverType.ZinkEGL) {
-			val driDirStream = StringBuilder()
-			val s = GetPathSeparator()
-			driDirStream.append(GetModuleDirectory()).append("mesa").append(s).append("src").append(s).append("gallium").append(s).append("targets").append(s).append("dri")
 
-			val driDir = driDirStream.toString()
-
-			SetEnvironmentVar("MESA_LOADER_DRIVER_OVERRIDE", "zink")
-			SetEnvironmentVar("LIBGL_DRIVERS_PATH", driDir)
-		}
-
-		if (ANGLE_USE_UTIL_LOADER) {
-			var getProcAddress: PFNEGLGETPROCADDRESSPROC
-			glWindowingLibrary.getAs("eglGetProcAddress", getProcAddress)
-			if (getProcAddress == null) {
-				println("Cannot load eglGetProcAddress")
-				return false
-			}
-
-			// Likely we will need to use a fallback to Library::getAs on non-ANGLE platforms.
-			LoadUtilEGL(getProcAddress)
-		}
 
 		// EGL_NO_DISPLAY + EGL_EXTENSIONS returns NULL before Android 10
 		val extensionString = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS) as String?
@@ -210,7 +189,6 @@ enum class GLESDriverType {
 	AngleVulkanSecondariesEGL,
 	SystemEGL,
 	SystemWGL,
-	ZinkEGL,
 }
 
 enum class GLWindowResult {