GeezerVison is showing github.com — Simplify build step · joehinkle11/JavaScriptKit@d5d6b96
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboard +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
|
1 | | -wasm-DEVELOPMENT-SNAPSHOT-2020-03-05-a |
| 1 | +wasm-DEVELOPMENT-SNAPSHOT-2020-03-06-a |
Collapse file
Copy file name to clipboardExpand all lines: Example/JavaScriptKitExample/Makefile -8Lines changed: 0 additions & 8 deletions Collapse file
Copy file name to clipboardExpand all lines: Example/Makefile +2-1Lines changed: 2 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -2,7 +2,8 @@ MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST))) |
2 | 2 |
|
3 | 3 | .PHONY: JavaScriptKitExample |
4 | 4 | JavaScriptKitExample: |
5 | | - cd JavaScriptKitExample && make build |
| 5 | + cd JavaScriptKitExample && \ |
| 6 | + swift build --triple wasm32-unknown-wasi |
6 | 7 |
|
7 | 8 | dist/JavaScriptKitExample.wasm: JavaScriptKitExample |
8 | 9 | mkdir -p dist |
|
Collapse file
Copy file name to clipboardExpand all lines: IntegrationTests/JavaScriptKitExec/Makefile -8Lines changed: 0 additions & 8 deletions Collapse file
Copy file name to clipboardExpand all lines: IntegrationTests/Makefile +2-1Lines changed: 2 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -2,7 +2,8 @@ MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST))) |
2 | 2 |
|
3 | 3 | .PHONY: JavaScriptKitExec |
4 | 4 | JavaScriptKitExec: |
5 | | - cd JavaScriptKitExec && make build |
| 5 | + cd JavaScriptKitExec && \ |
| 6 | + swift build --triple wasm32-unknown-wasi |
6 | 7 |
|
7 | 8 | dist/JavaScriptKitExec.wasm: JavaScriptKitExec |
8 | 9 | mkdir -p dist |
|
Collapse file
Copy file name to clipboard +3-8Lines changed: 3 additions & 8 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
1 | 1 | MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST))) |
2 | | -WASI_SDK_DIR ?= $(MAKEFILE_DIR)/.wasi-sdk |
3 | | -WASI_SYSROOT ?= $(WASI_SDK_DIR)/share/wasi-sysroot |
4 | 2 |
|
5 | 3 | .PHONY: bootstrap |
6 | 4 | bootstrap: |
7 | 5 | cd Runtime && npm install |
8 | 6 |
|
9 | 7 | .PHONY: build |
10 | | -build: .wasi-sdk/dummy |
11 | | - ./script/build-package.sh $(WASI_SYSROOT) |
| 8 | +build: |
| 9 | + swift build --triple wasm32-unknown-wasi |
12 | 10 | cd Runtime && npm run build |
13 | 11 |
|
14 | 12 | .PHONY: test |
15 | | -test: build |
| 13 | +test: |
16 | 14 | cd IntegrationTests && make test |
17 | 15 |
|
18 | | -.wasi-sdk/dummy: |
19 | | - ./script/install-wasi-sdk.sh $(WASI_SDK_DIR) |
20 | | - touch .wasi-sdk/dummy |
Collapse file
Copy file name to clipboardExpand all lines: Package.swift +16-2Lines changed: 16 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -10,9 +10,23 @@ let package = Package( |
10 | 10 | targets: [ |
11 | 11 | .target( |
12 | 12 | name: "JavaScriptKit", |
13 | | - dependencies: ["_CJavaScriptKit"]), |
| 13 | + dependencies: ["_CJavaScriptKit"], |
| 14 | + linkerSettings: [ |
| 15 | + .unsafeFlags([ |
| 16 | + "-Xlinker", |
| 17 | + "--export=swjs_call_host_function", |
| 18 | + "-Xlinker", |
| 19 | + "--export=swjs_prepare_host_function_call" |
| 20 | + ]) |
| 21 | + ]), |
14 | 22 | .target( |
15 | | - name: "_CJavaScriptKit"), |
| 23 | + name: "_CJavaScriptKit", |
| 24 | + linkerSettings: [ |
| 25 | + .unsafeFlags([ |
| 26 | + "-Xlinker", |
| 27 | + "--allow-undefined", |
| 28 | + ]) |
| 29 | + ]), |
16 | 30 | .testTarget( |
17 | 31 | name: "JavaScriptKitTests", |
18 | 32 | dependencies: ["JavaScriptKit"]), |
|
Collapse file
Copy file name to clipboardExpand all lines: script/build-package.sh -10Lines changed: 0 additions & 10 deletions