Correct makefile for linux

Author: ktoso

Makefile

@@ -15,23 +15,38 @@
 .PHONY: run clean all
 
 ARCH := $(shell arch)
+UNAME := $(shell uname)
+
+ifeq ($(UNAME), Linux)
+ifeq ($(ARCH), 'i386')
+  ARCH_SUBDIR := x86_64
+else
+  ARCH_SUBDIR := aarch64
+endif
+BUILD_DIR := .build/$(ARCH_SUBDIR)-unknown-linux-gnu
+LIB_SUFFIX := so
+endif
+
+ifeq ($(UNAME), Darwin)
 ifeq ($(ARCH), 'i386')
   ARCH_SUBDIR := x86_64
 else
   ARCH_SUBDIR := arm64
 endif
+BUILD_DIR := .build/$(ARCH_SUBDIR)-apple-macosx
+LIB_SUFFIX := dylib
+endif
 
-BUILD_DIR=".build/$(ARCH_SUBDIR)-apple-macosx"
 
 all: generate-all
 
-$(BUILD_DIR)/debug/libJavaKit.dylib $(BUILD_DIR)/debug/libJavaKitExample.dylib $(BUILD_DIR)/debug/Java2Swift:
+$(BUILD_DIR)/debug/libJavaKit.$(LIB_SUFFIX) $(BUILD_DIR)/debug/libJavaKitExample.$(LIB_SUFFIX) $(BUILD_DIR)/debug/Java2Swift:
 	swift build
 
 ./JavaSwiftKitDemo/build/classes/java/main/com/example/swift/HelloSubclass.class: JavaSwiftKitDemo/src/main/java/com/example/swift
 	./gradlew build
 
-run: $(BUILD_DIR)/debug/libJavaKit.dylib $(BUILD_DIR)/debug/libJavaKitExample.dylib JavaSwiftKitDemo/src/main/java/com/example/swift
+run: $(BUILD_DIR)/debug/libJavaKit.$(LIB_SUFFIX) $(BUILD_DIR)/debug/libJavaKitExample.$(LIB_SUFFIX) JavaSwiftKitDemo/src/main/java/com/example/swift
 	java -cp JavaSwiftKitDemo/build/classes/java/main -Djava.library.path=$(BUILD_DIR)/debug/ com.example.swift.HelloSwift
 
 Java2Swift: $(BUILD_DIR)/debug/Java2Swift
@@ -82,7 +97,7 @@ endef
 jextract-swift: generate-JExtract-interface-files
 	swift build
 
-generate-JExtract-interface-files: $(BUILD_DIR)/debug/libJavaKit.dylib
+generate-JExtract-interface-files: $(BUILD_DIR)/debug/libJavaKit.$(LIB_SUFFIX)
 	echo "Generate .swiftinterface files..."
 	@$(call make_swiftinterface, "JavaKitExample", "MySwiftLibrary")
 	@$(call make_swiftinterface, "JavaKitExample", "SwiftKit")

Package.swift

@@ -32,11 +32,11 @@ let javaHome = findJavaHome()
 
 let javaIncludePath = "\(javaHome)/include"
 #if os(Linux)
-let javaPlatformIncludePath = "\(javaIncludePath)/linux"
+  let javaPlatformIncludePath = "\(javaIncludePath)/linux"
 #elseif os(macOS)
-let javaPlatformIncludePath = "\(javaIncludePath)/darwin"
+  let javaPlatformIncludePath = "\(javaIncludePath)/darwin"
 #else
-#error("Currently only macOS and Linux platforms are supported, this may change in the future.")
+  #error("Currently only macOS and Linux platforms are supported, this may change in the future.")
 // TODO: Handle windows as well
 #endif
 

docker/Dockerfile

@@ -17,6 +17,6 @@ ENV LANGUAGE=en_US.UTF-8
 
 # JDK dependency
 COPY install_jdk.sh .
-RUN bash -x ./install_jdk.sh
+RUN bash -xc 'JDK_VENDOR=Corretto ./install_jdk.sh'
 ENV JAVA_HOME="/usr/lib/jvm/default-jdk"
 ENV PATH="$PATH:/usr/lib/jvm/default-jdk/bin"