7903720: Change layout of jextract image

Reviewed-by: mcimadamore

Author: JornVernee

.github/workflows/test.yml

@@ -46,18 +46,13 @@ jobs:
     needs: [build-jtreg]
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-20.04, windows-latest]
+        os: [ubuntu-20.04, windows-latest]
         include:
           - os: ubuntu-20.04
             TARGET: clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-20.04
             ARCHIVE_EXT: "tar.xz"
             LIB_DIR: lib
             DEPS_ROOT: /tmp/deps
-          - os: macos-latest
-            TARGET: clang+llvm-13.0.0-x86_64-apple-darwin
-            ARCHIVE_EXT: "tar.xz"
-            LIB_DIR: lib
-            DEPS_ROOT: /tmp/deps
           - os: windows-latest
             TARGET: LLVM-13.0.0-win64
             ARCHIVE_EXT: "exe"
@@ -69,7 +64,7 @@ jobs:
       uses: actions/[email protected]
       with:
         fetch-depth: 1
-        
+
     - name: 'Prepare'
       shell: sh
       run: |
@@ -90,7 +85,7 @@ jobs:
         website: jdk.java.net
         release: ${{ env.TOOLCHAIN_VERSION }}
         install: false
-        
+
     - name: 'Extract Toolchain JDK (Non Windows)'
       if: ${{ matrix.os != 'windows-latest' && steps.get-cached-toolchain.outputs.cache-hit != 'true' }}
       shell: sh

build.gradle

@@ -1,6 +1,7 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermission;
 
 plugins {
     id "java"
@@ -123,12 +124,26 @@ task createJextractImage(type: Exec) {
     args = [
          "--module-path=$jmods_dir",
          "--add-modules=org.openjdk.jextract",
-         "--output=${jextract_app_dir}",
-         "--launcher=jextract=org.openjdk.jextract/org.openjdk.jextract.JextractTool",
+         "--output=${jextract_app_dir}/runtime",
          "--strip-debug", "--no-man-pages", "--no-header-files",
          "--add-options",
          "${quote_jlink_opts}"
     ]
+
+    doLast {
+        // Add launcher scripts
+        Path unixOut = Path.of("${jextract_app_dir}/jextract");
+        Files.copy(Path.of("$projectDir/src/main/jextract"), unixOut);
+        if (unixOut.getFileSystem().supportedFileAttributeViews().contains("posix")) {
+            Set<PosixFilePermission> perms = Files.getPosixFilePermissions(unixOut);
+            perms.add(PosixFilePermission.OWNER_EXECUTE);
+            perms.add(PosixFilePermission.GROUP_EXECUTE);
+            perms.add(PosixFilePermission.OTHERS_EXECUTE);
+            Files.setPosixFilePermissions(unixOut, perms);
+        }
+
+        Files.copy(Path.of("$projectDir/src/main/jextract.bat"), Path.of("${jextract_app_dir}/jextract.bat"))
+    }
 }
 
 // build the jextract image when the build or assemble task is run
@@ -138,7 +153,7 @@ assemble.dependsOn(createJextractImage)
 task verify(type: Exec) {
     dependsOn createJextractImage
 
-    executable = "${jextract_app_dir}/bin/jextract${os_script_extension}"
+    executable = "${jextract_app_dir}/jextract${os_script_extension}"
     args = [ "test.h", "--output", "$buildDir/integration_test" ]
 }
 

make/Build.gmk

@@ -80,11 +80,12 @@ $(BUILD_MODULES_DIR): $(BUILD_CLASSES_DIR)
 $(JEXTRACT_IMAGE_DIR): $(BUILD_MODULES_DIR)
         # jlink the modules to create a custom runtime image for jextract
 	$(FIXPATH) $(PANAMA_JAVA_HOME)/bin/jlink \
-	    --output "$(JEXTRACT_IMAGE_DIR)" \
+	    --output "$(JEXTRACT_IMAGE_DIR)/runtime" \
 	    --module-path "$(BUILD_MODULES_DIR)" \
 	    --add-modules org.openjdk.jextract \
-	    --add-options "\"--enable-native-access=org.openjdk.jextract\" \"--enable-preview\"" \
-	    --launcher jextract=org.openjdk.jextract/org.openjdk.jextract.JextractTool
+	    --add-options "\"--enable-native-access=org.openjdk.jextract\" \"--enable-preview\""
+	$(CP) src/main/jextract "$(JEXTRACT_IMAGE_DIR)"
+	$(CP) src/main/jextract.bat "$(JEXTRACT_IMAGE_DIR)"
 
 $(JEXTRACT_IMAGE_TEST_JDK_DIR): $(JEXTRACT_IMAGE_DIR)
         # jlink the modules to create a custom runtime image for jextract testing

src/main/jextract

@@ -0,0 +1,3 @@
+#!/bin/sh
+DIR=`dirname $0`
+$DIR/runtime/bin/java $JEXTRACT_JAVA_OPTIONS -m org.openjdk.jextract/org.openjdk.jextract.JextractTool "$@"

src/main/jextract.bat

@@ -0,0 +1,2 @@
+@set DIR=%~dp0
+@"%DIR%\runtime\bin\java" %JEXTRACT_JAVA_OPTIONS% -m org.openjdk.jextract/org.openjdk.jextract.JextractTool %*