Fix updated paths

kateinoigakukun · kateinoigakukun · commit 8f73881cd7a3 · 2020-03-05T18:04:10.000+09:00
diff --git a/IntegrationTests/JavaScriptKitExec/Makefile b/IntegrationTests/JavaScriptKitExec/Makefile
diff --git a/IntegrationTests/JavaScriptKitExec/Makefile b/IntegrationTests/JavaScriptKitExec/Makefile
@@ -0,0 +1,8 @@
+MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+SRCROOT := $(MAKEFILE_DIR)/../../
+SCRIPT_DIR := $(SRCROOT)/script
+WASI_SDK_DIR ?= $(SRCROOT)/.wasi-sdk
+WASI_SYSROOT ?= $(WASI_SDK_DIR)/share/wasi-sysroot
+
+build:
+	$(SCRIPT_DIR)/build-package.sh $(WASI_SYSROOT)
diff --git a/IntegrationTests/JavaScriptKitExec/Package.swift b/IntegrationTests/JavaScriptKitExec/Package.swift
@@ -9,6 +9,6 @@ let package = Package(
             name: "JavaScriptKitExec", targets: ["JavaScriptKitExec"]
         ),
     ],
-    dependencies: [.package(name: "JavaScriptKit", path: "../../src/swift")],
+    dependencies: [.package(name: "JavaScriptKit", path: "../../")],
     targets: [.target(name: "JavaScriptKitExec", dependencies: ["JavaScriptKit"])]
 )
diff --git a/IntegrationTests/JavaScriptKitExec/script b/IntegrationTests/JavaScriptKitExec/script
diff --git a/IntegrationTests/Makefile b/IntegrationTests/Makefile
@@ -1,5 +1,4 @@
 MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
-SWIFT_LIB_DIR ?= $(MAKEFILE_DIR)/../src/swift
 
 .PHONY: JavaScriptKitExec
 JavaScriptKitExec:
@@ -10,6 +9,6 @@ dist/JavaScriptKitExec.wasm: JavaScriptKitExec
 	cp ./JavaScriptKitExec/.build/debug/JavaScriptKitExec $@
 
 build: dist/JavaScriptKitExec.wasm
-	cd ../src/web && npm run build
+	cd ../Runtime && npm run build
 test: build
 	node index.js
diff --git a/IntegrationTests/package-lock.json b/IntegrationTests/package-lock.json
diff --git a/IntegrationTests/package.json b/IntegrationTests/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "javascript-kit-swift": "file:../src/web",
+    "javascript-kit-swift": "file:../Runtime",
     "@wasmer/wasi": "^0.9.1",
     "@wasmer/wasmfs": "^0.9.1"
   }
diff --git a/Makefile b/Makefile
@@ -1,15 +1,11 @@
 MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 WASI_SDK_DIR ?= $(MAKEFILE_DIR)/.wasi-sdk
-
+WASI_SYSROOT ?= $(WASI_SDK_DIR)/share/wasi-sysroot
 
 build: .wasi-sdk/dummy
-	swift build --triple wasm32-unknown-wasi \
-		-Xswiftc -Xclang-linker \
-		-Xswiftc --sysroot=$(WASI_SDK_DIR)/share/wasi-sysroot \
-		-Xcc --sysroot=$(WASI_SDK_DIR)/share/wasi-sysroot \
-		-Xlinker --allow-undefined \
-		-Xlinker --export=swjs_call_host_function \
-		-Xlinker --export=swjs_prepare_host_function_call
+	./script/build-package.sh $(WASI_SYSROOT)
 .wasi-sdk/dummy:
 	./script/install-wasi-sdk.sh $(WASI_SDK_DIR)
 	touch .wasi-sdk/dummy
+test:
+	cd IntegrationTests && make test
diff --git a/example/JavaScriptKitExample/Package.swift b/example/JavaScriptKitExample/Package.swift
@@ -9,6 +9,6 @@ let package = Package(
             name: "JavaScriptKitExample", targets: ["JavaScriptKitExample"]
         ),
     ],
-    dependencies: [.package(name: "JavaScriptKit", path: "../../src/swift")],
+    dependencies: [.package(name: "JavaScriptKit", path: "../../")],
     targets: [.target(name: "JavaScriptKitExample", dependencies: ["JavaScriptKit"])]
 )
diff --git a/example/Makefile b/example/Makefile
@@ -1,5 +1,4 @@
 MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
-SWIFT_LIB_DIR ?= $(MAKEFILE_DIR)/../src/swift
 
 .PHONY: JavaScriptKitExample
 JavaScriptKitExample:
@@ -10,5 +9,5 @@ dist/JavaScriptKitExample.wasm: JavaScriptKitExample
 	cp ./JavaScriptKitExample/.build/debug/JavaScriptKitExample $@
 
 build: dist/JavaScriptKitExample.wasm
-	cd ../src/web && npm run build
+	cd ../Runtime && npm run build
 	npm run build
diff --git a/example/package.json b/example/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "@wasmer/wasi": "^0.9.1",
     "@wasmer/wasmfs": "^0.9.1",
-    "javascript-kit-swift": "file:../src/web"
+    "javascript-kit-swift": "file:../Runtime"
   },
   "devDependencies": {
     "webpack": "^4.42.0",
diff --git a/script/build-package.sh b/script/build-package.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+WASI_SYSROOT=$1
+
+swift build --triple wasm32-unknown-wasi \
+	-Xswiftc -Xclang-linker \
+	-Xswiftc --sysroot=$WASI_SYSROOT \
+	-Xcc --sysroot=$WASI_SYSROOT \
+	-Xlinker --allow-undefined \
+	-Xlinker --export=swjs_call_host_function \
+	-Xlinker --export=swjs_prepare_host_function_call

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ let package = Package(`
`9`	`9`	`name: "JavaScriptKitExec", targets: ["JavaScriptKitExec"]`
`10`	`10`	`),`
`11`	`11`	`],`
`12`		`- dependencies: [.package(name: "JavaScriptKit", path: "../../src/swift")],`
	`12`	`+ dependencies: [.package(name: "JavaScriptKit", path: "../../")],`
`13`	`13`	`targets: [.target(name: "JavaScriptKitExec", dependencies: ["JavaScriptKit"])]`
`14`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`		`- "javascript-kit-swift": "file:../src/web",`
	`3`	`+ "javascript-kit-swift": "file:../Runtime",`
`4`	`4`	`"@wasmer/wasi": "^0.9.1",`
`5`	`5`	`"@wasmer/wasmfs": "^0.9.1"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ let package = Package(`
`9`	`9`	`name: "JavaScriptKitExample", targets: ["JavaScriptKitExample"]`
`10`	`10`	`),`
`11`	`11`	`],`
`12`		`- dependencies: [.package(name: "JavaScriptKit", path: "../../src/swift")],`
	`12`	`+ dependencies: [.package(name: "JavaScriptKit", path: "../../")],`
`13`	`13`	`targets: [.target(name: "JavaScriptKitExample", dependencies: ["JavaScriptKit"])]`
`14`	`14`	`)`