Skip to content

Commit 2d18a66

Browse files
authored
Hook cleaner upgrade (#14)
* updated hook-cleaner-c, from new origin * copying hook-cleaner into docker * calling hook-cleaner after build
1 parent 6cfb879 commit 2d18a66

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
url = https://github.com/XRPLF/wasi-sdk
77
[submodule "hook-cleaner-c"]
88
path = hook-cleaner-c
9-
url = https://github.com/RichardAH/hook-cleaner-c
9+
url = https://github.com/XRPLF/hook-cleaner-c

c2wasm-api/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ function link_c_files(source_files: string[], compile_options: string, link_opti
183183
}
184184

185185
function clean_wasm(cwd: string, inplace: string, result_obj: Task) {
186-
const cmd = 'cleaner ' + inplace;
186+
const cmd = 'hook-cleaner ' + inplace;
187187
const out = openSync(cwd + '/cleanout.log', 'w');
188188
let error = '';
189189
let success = true;

cleaner-build/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ build2:
1111
docker run -v $(realpath ../hook-cleaner-c):/mnt/hook-cleaner $(CLEANER_BUILD_CONTAINER_TAG):latest
1212

1313
install:
14-
cp ../hook-cleaner-c/cleaner ../bin
14+
cp ../hook-cleaner-c/hook-cleaner ../bin
1515

1616
clean:
17-
-rm ../hook-cleaner-c/cleaner
17+
-rm ../hook-cleaner-c/hook-cleaner

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ COPY c2wasm-api/yarn.lock .
1010
COPY c2wasm-api/tsconfig.json .
1111
COPY c2wasm-api/src ./src
1212
COPY wasi-sdk ./clang/wasi-sdk
13-
COPY cleaner /usr/bin
13+
COPY hook-cleaner /usr/bin
1414
COPY run.sh .
1515
ADD compile_flags.txt /etc/clangd/compile_flags.txt
1616
ADD .clang-tidy /work/.clang-tidy

docker/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MAIN_CONTAINER_TAG?=xrpl-hooks-compiler
55
build: dependencies
66
docker build -t $(MAIN_CONTAINER_TAG) .
77

8-
dependencies: wasi-sdk c2wasm-api clangd cleaner
8+
dependencies: wasi-sdk c2wasm-api clangd hook-cleaner
99

1010
run:
1111
docker run -p 127.0.0.1:9000:9000/tcp $(MAIN_CONTAINER_TAG):latest
@@ -23,11 +23,11 @@ wasi-sdk: ../wasi-sdk.ts
2323
clangd: ../bin/clangd
2424
cp $< .
2525

26-
cleaner: ../bin/cleaner
26+
hook-cleaner: ../bin/hook-cleaner
2727
cp $< .
2828

2929
c2wasm-api: ../c2wasm-api
3030
cp -LR $< .
3131

3232
clean:
33-
-rm -rf c2wasm-api clangd wasi-sdk
33+
-rm -rf c2wasm-api clangd wasi-sdk hook-cleaner

0 commit comments

Comments
 (0)