Skip to content

Commit e6e7f98

Browse files
Upload linux wabt binary
1 parent ada0dd4 commit e6e7f98

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

Makefile

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
SWIFT_LINUX_TOOLCHAIN_DOWNLOAD_URL="https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-04-07-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-04-07-a-linux.tar.gz"
2+
WABT_LINUX_DOWNLOAD_URL="https://github.com/WebAssembly/wabt/releases/download/1.0.12/wabt-1.0.12-linux.tar.gz"
3+
24
ifeq ($(shell uname),Darwin)
35
WABT_DOWNLOAD_URL="https://github.com/WebAssembly/wabt/releases/download/1.0.12/wabt-1.0.12-osx.tar.gz"
46
SWIFT_TOOLCHAIN_DOWNLOAD_URL="https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-04-07-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-04-07-a-osx.tar.gz"
57
else ifeq ($(shell uname),Linux)
6-
WABT_DOWNLOAD_URL="https://github.com/WebAssembly/wabt/releases/download/1.0.12/wabt-1.0.12-linux.tar.gz"
8+
WABT_DOWNLOAD_URL=$(WABT_LINUX_DOWNLOAD_URL)
79
SWIFT_TOOLCHAIN_DOWNLOAD_URL=$(SWIFT_LINUX_TOOLCHAIN_DOWNLOAD_URL)
810
endif
911

@@ -13,24 +15,34 @@ LIBSTDCXX_DOWNLOAD_URL="http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyp
1315
prebuilt/wabt:
1416
mkdir -p $@ && cd $@ && \
1517
curl -L $(WABT_DOWNLOAD_URL) | tar xz --strip-components 1
16-
./utils/remove-wabt-extra-files.sh
1718
prebuilt/swift:
1819
mkdir -p $@ && cd $@ && \
1920
curl -L $(SWIFT_TOOLCHAIN_DOWNLOAD_URL) | tar xz --strip-components 1
21+
prebuilt/linux/wabt: prebuilt/wabt
22+
ifeq ($(shell uname),Linux)
23+
mkdir -p prebuilt/linux
24+
cp -a prebuilt/wabt prebuilt/linux/wabt
25+
else
26+
mkdir -p $@ && cd $@ && \
27+
curl -L $(WABT_LINUX_DOWNLOAD_URL) | tar xz --strip-components 1
28+
endif
29+
./utils/remove-wabt-extra-files.sh ./prebuilt/linux/wabt
30+
2031
prebuilt/linux/swift: prebuilt/swift
2132
ifeq ($(shell uname),Linux)
33+
mkdir -p prebuilt/linux
2234
cp -a prebuilt/swift prebuilt/linux/swift
2335
else
2436
mkdir -p $@ && cd $@ && \
2537
curl -L $(SWIFT_LINUX_TOOLCHAIN_DOWNLOAD_URL) | tar xz --strip-components 1
26-
./utils/remove-swift-extra-files.sh ./prebuilt/linux/swift
2738
endif
39+
./utils/remove-swift-extra-files.sh ./prebuilt/linux/swift
2840
prebuilt/libatomic.so.1:
2941
./utils/download-libatomic.sh $(LIBATOMIC_DOWNLOAD_URL)
3042
prebuilt/libstdc++.so.6:
3143
./utils/download-libstdc++.sh $(LIBSTDCXX_DOWNLOAD_URL)
3244

33-
FirebaseFunction/functions/prebuilt: prebuilt/linux/swift prebuilt/wabt
45+
FirebaseFunction/functions/prebuilt: prebuilt/linux/swift prebuilt/linux/wabt
3446
mkdir -p $@
3547
cp -af $^ $@
3648
FirebaseFunction/functions/service.js: service.js

utils/remove-swift-extra-files.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
2-
source="$(cd "$(dirname $0)/.." && pwd)"
32
basepath="$1"
43
filestoremove="bin/sil-*
54
bin/lldb*
@@ -16,7 +15,6 @@ bin/swift-run
1615
bin/swift-test
1716
bin/swift-api-digester
1817
bin/swift-ast-script
19-
bin/swift-autolink-extract
2018
bin/swift-demangle
2119
bin/swift-demangle-yamldump
2220
bin/swift-format

utils/remove-wabt-extra-files.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/sh
2-
source="$(cd "$(dirname $0)/.." && pwd)"
3-
basepath="$source/prebuilt/wabt/"
2+
basepath="$1"
43
filestoremove="spectest-interp wasm2c wasm2wat wasm-interp wasm-objdump wasm-opcodecnt wasm-validate wast2json wat2wasm wat-desugar"
54
for i in $filestoremove
65
do

0 commit comments

Comments
 (0)