Skip to content

Commit 91148b7

Browse files
committed
Fix build setting.
1 parent 490dc4e commit 91148b7

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ clang -no-pie tiger.s ./target/release/libcdylib.dylib
4949

5050
#### Wasm
5151

52-
see ([compiler/Makefile.toml](./compiler/Makefile.toml), [index.html](./compiler/tests/index.html), [test.js](./compiler/tests/test.js)) or ([web/Makefile.toml](./web/Makefile.toml), [runWasm.ts](./web/web/src/runWasm.ts)).
52+
see ([compiler-lib/Makefile.toml](./compiler-lib/Makefile.toml), [index.html](./compiler-lib/tests/index.html), [test.js](./compiler-lib/tests/test.js)) or ([web/Makefile.toml](./web/Makefile.toml), [runWasm.ts](./web/web/src/runWasm.ts)).
5353

5454
### Supported platform.
5555

cdylib/Makefile.toml

Whitespace-only changes.

compiler-lib/Makefile.toml

+16-5
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,28 @@ description = "Build cdylib for compiler integration test"
33
cwd = "../cdylib"
44
install_crate = "wasm-pack"
55
command = "wasm-pack"
6-
args = ["build", "--target", "nodejs", "--out-dir", "../compiler/tests/pkg"]
6+
args = ["build", "--target", "nodejs", "--out-dir", "../compiler-lib/tests/pkg"]
77

88
[tasks.prepare-integration-test-release]
99
description = "Build cdylib for compiler integration test (release)"
1010
extend = "prepare-integration-test"
11-
args = ["build", "--target", "nodejs", "--release", "--out-dir", "../compiler/tests/pkg"]
11+
args = ["build", "--target", "nodejs", "--release", "--out-dir", "../compiler-lib/tests/pkg"]
1212

1313
[tasks.test]
1414
description = "Run tests"
15-
dependencies = ["prepare-integration-test", "build"]
15+
dependencies = [
16+
{ name = "prepare-integration-test" },
17+
{ name = "build-release", path = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/cdylib" }
18+
]
1619
command = "cargo"
1720
args = ["test"]
1821

1922
[tasks.test-release]
2023
description = "Run tests (release)"
21-
dependencies = ["prepare-integration-test-release", "build-release"]
24+
dependencies = [
25+
{ name = "prepare-integration-test-release" },
26+
{ name = "build-release", path = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/cdylib" }
27+
]
2228
command = "cargo"
2329
args = ["test", "--release"]
2430

@@ -27,11 +33,16 @@ description = "Clean rust artifacts"
2733
command = "rm"
2834
args = ["-rf", "./tests/pkg"]
2935

36+
[tasks.clean-asm]
37+
script = '''
38+
rm -rf ./tests/*.s
39+
'''
40+
3041
[tasks.clean-rust]
3142
description = "Clean rust artifacts"
3243
command = "cargo"
3344
args = ["clean"]
3445

3546
[tasks.clean]
3647
description = "Clean"
37-
dependencies = ["clean-dylib", "clean-rust"]
48+
dependencies = ["clean-dylib", "clean-rust", "clean-asm"]

web/web/src/App.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function App() {
3636
<div className="grid-container">
3737
<div className="button-wrapper">
3838
<Button onClick={onClickRun}>Run</Button>
39-
<ButtonLink href="https://github.com/Hosshii/tiger-rs/tree/main/compiler/tests/testfiles">
39+
<ButtonLink href="https://github.com/Hosshii/tiger-rs/tree/main/compiler-lib/tests/testfiles">
4040
Examples
4141
</ButtonLink>
4242
</div>

0 commit comments

Comments
 (0)