fixing paths for linux

Author: ktoso

BuildLogic/src/main/kotlin/build-logic.java-common-conventions.gradle.kts

@@ -91,17 +91,3 @@ tasks.withType<Test> {
         this.showStandardStreams = true
     }
 }
-
-
-// TODO: This is a crude workaround, we'll remove 'make' soon and properly track build dependencies
-// val buildSwiftJExtract = tasks.register<Exec>("buildMake") {
-//    description = "Triggers 'make' build"
-//
-//    workingDir(rootDir)
-//    commandLine("make")
-// }
-//
-// tasks.build {
-//     dependsOn(buildSwiftJExtract)
-// }
-

Plugins/JExtractSwiftCommandPlugin/JExtractSwiftCommandPlugin.swift

@@ -52,7 +52,7 @@ final class JExtractSwiftCommandPlugin: BuildToolPlugin, CommandPlugin {
 
     for target in context.package.targets {
       guard let configPath = getSwiftJavaConfig(target: target) else {
-        log("Skipping target '\(target.name), has no 'swift-java.config' file")
+        log("Skipping target '\(target.name)', has no 'swift-java.config' file")
         continue
       }
 
@@ -63,8 +63,8 @@ final class JExtractSwiftCommandPlugin: BuildToolPlugin, CommandPlugin {
         print("[swift-java-command] error: Failed to extract from target '\(target.name)': \(error)")
       }
 
-      print("[swift-java-command] Done.")
     }
+    print("[swift-java-command] Generating sources: " + "done".green + ".")
   }
 
   /// Perform the command on a specific target.
@@ -146,3 +146,10 @@ final class JExtractSwiftCommandPlugin: BuildToolPlugin, CommandPlugin {
     }
   }
 }
+
+// Mini coloring helper, since we cannot have dependencies we keep it minimal here
+extension String {
+  var green: String {
+    "\u{001B}[0;32m" + "\(self)" + "\u{001B}[0;0m"
+  }
+}

Sources/JExtractSwift/Swift2JavaVisitor.swift

@@ -136,7 +136,7 @@ final class Swift2JavaVisitor: SyntaxVisitor {
 
     // TODO: filter out kinds of variables we cannot import
 
-    self.log.info("Import variable: \(node.kind) \(fullName)")
+    self.log.debug("Import variable: \(node.kind) \(fullName)")
 
     let returnTy: TypeSyntax
     if let typeAnnotation = binding.typeAnnotation {
@@ -167,7 +167,7 @@ final class Swift2JavaVisitor: SyntaxVisitor {
     }
 
     if let currentTypeName {
-      log.info("Record variable in \(currentTypeName)")
+      log.debug("Record variable in \(currentTypeName)")
       translator.importedTypes[currentTypeName]!.variables.append(varDecl)
     } else {
       fatalError("Global variables are not supported yet: \(node.debugDescription)")

SwiftKit/src/main/java/org/swift/swiftkit/SwiftKit.java

@@ -28,6 +28,7 @@
 public class SwiftKit {
 
     public static final String STDLIB_DYLIB_NAME = "swiftCore";
+    public static final String SWIFTKITSWIFT_DYLIB_NAME = "SwiftKitSwift";
     private static final String STDLIB_MACOS_DYLIB_PATH = "/usr/lib/swift/libswiftCore.dylib";
 
     private static final Arena LIBRARY_ARENA = Arena.ofAuto();
@@ -38,7 +39,6 @@ public class SwiftKit {
 
     static boolean initializeLibs() {
         System.loadLibrary(STDLIB_DYLIB_NAME);
-        System.loadLibrary("SwiftKitSwift");
         return true;
     }
 

SwiftKit/src/test/java/org/swift/swiftkit/SwiftRuntimeMetadataTest.java

@@ -15,10 +15,19 @@
 package org.swift.swiftkit;
 
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class SwiftRuntimeMetadataTest {
 
+    @BeforeEach
+    void setUp() {
+        System.out.println("Java path ====== '" + SwiftKit.getJavaLibraryPath() + "'");
+        for (var path : SwiftKit.getJavaLibraryPath().split(":")) {
+            System.out.println("    " + path);
+        }
+    }
+
     @Test
     public void integer_layout_metadata() {
         SwiftAnyType swiftType = SwiftKit.getTypeByMangledNameInEnvironment("Si").get();

buildSrc/src/main/groovy/org/swift/swiftkit/gradle/BuildUtils.groovy

@@ -38,6 +38,7 @@ final class BuildUtils {
                         /* macOS */ (osArch == "aarch64" ?
                         "${base}../../.build/arm64-apple-macosx/debug/" :
                         "${base}../../.build/${osArch}-apple-macosx/debug/"),
+                        "SOMETHING"
         ]
         def releasePaths = debugPaths.collect { it.replaceAll("debug", "release") }
         def systemPaths = [

docker/Dockerfile

@@ -21,10 +21,10 @@ ENV LANGUAGE=en_US.UTF-8
 # JDK dependency
 COPY install_jdk.sh .
 RUN bash -xc 'JDK_VENDOR=Corretto ./install_jdk.sh'
-ENV JAVA_HOME="/usr/lib/jvm/default-jdk"
+ENV
 ENV PATH="$PATH:/usr/lib/jvm/default-jdk/bin"
 
 # Install "untested" nightly 'main' Swift
 # TODO: Only do this if the released Swift is older than what we require
-COPY install_untested_nightly_swift.sh .
-RUN bash -xc './install_untested_nightly_swift.sh'
+#COPY install_untested_nightly_swift.sh .
+RUN #bash -xc './install_untested_nightly_swift.sh'