Simplify build system

.github/workflows/test.yml

@@ -3,7 +3,13 @@ on: [push, pull_request]
 jobs:
   test:
     name: Build and Test
-    runs-on: macOS-10.15
+    strategy:
+      matrix:
+        os: [macOS-10.15]
+        include:
+          - os: macOS-10.15
+            toolchain: https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-03-08-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-03-08-a-osx.tar.gz
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@master
@@ -19,4 +25,4 @@ jobs:
           make bootstrap
           make test
         env:
-          TOOLCHAIN_DOWNLOAD: https://github.com/kateinoigakukun/swiftwasm/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-03-05-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-03-05-a-osx.tar.gz
+          TOOLCHAIN_DOWNLOAD: ${{ matrix.toolchain }}

.gitignore

@@ -1,6 +1,5 @@
 dist
 node_modules
-.wasi-sdk
 .DS_Store
 /.build
 /Packages

.swift-version

@@ -1 +1 @@
-wasm-DEVELOPMENT-SNAPSHOT-2020-03-05-a
+wasm-DEVELOPMENT-SNAPSHOT-2020-03-08-a

Example/Makefile

@@ -2,7 +2,8 @@ MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
 .PHONY: JavaScriptKitExample
 JavaScriptKitExample:
-	cd JavaScriptKitExample && make build
+	cd JavaScriptKitExample && \
+	    swift build --triple wasm32-unknown-wasi
 
 dist/JavaScriptKitExample.wasm: JavaScriptKitExample
 	mkdir -p dist

IntegrationTests/Makefile

@@ -2,7 +2,8 @@ MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
 .PHONY: JavaScriptKitExec
 JavaScriptKitExec:
-	cd JavaScriptKitExec && make build
+	cd JavaScriptKitExec &&  \
+	    swift build --triple wasm32-unknown-wasi
 
 dist/JavaScriptKitExec.wasm: JavaScriptKitExec
 	mkdir -p dist

Makefile

@@ -1,20 +1,15 @@
 MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
-WASI_SDK_DIR ?= $(MAKEFILE_DIR)/.wasi-sdk
-WASI_SYSROOT ?= $(WASI_SDK_DIR)/share/wasi-sysroot
 
 .PHONY: bootstrap
 bootstrap:
 	cd Runtime && npm install
 
 .PHONY: build
-build: .wasi-sdk/dummy
-	./script/build-package.sh $(WASI_SYSROOT)
+build:
+	swift build --triple wasm32-unknown-wasi
 	cd Runtime && npm run build
 
 .PHONY: test
-test: build
+test:
 	cd IntegrationTests && make test
 
-.wasi-sdk/dummy:
-	./script/install-wasi-sdk.sh $(WASI_SDK_DIR)
-	touch .wasi-sdk/dummy

Package.swift

@@ -10,9 +10,23 @@ let package = Package(
     targets: [
         .target(
             name: "JavaScriptKit",
-            dependencies: ["_CJavaScriptKit"]),
+            dependencies: ["_CJavaScriptKit"],
+            linkerSettings: [
+              .unsafeFlags([
+                "-Xlinker",
+                "--export=swjs_call_host_function",
+                "-Xlinker",
+                "--export=swjs_prepare_host_function_call"
+              ])
+            ]),
         .target(
-            name: "_CJavaScriptKit"),
+            name: "_CJavaScriptKit",
+            linkerSettings: [
+              .unsafeFlags([
+                "-Xlinker",
+                "--allow-undefined",
+              ])
+            ]),
         .testTarget(
             name: "JavaScriptKitTests",
             dependencies: ["JavaScriptKit"]),