Fix paths, macOS package copies Linux glibc.modulemap

Author: MaxDesiatov

build-linux-package.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 echo "Unpacking Linux prebuilts"
+mkdir -p output
 cd linux
 ./unpack-prebuilts.sh
 echo "Compressing"

build-mac-package.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 echo "Unpacking macOS prebuilts"
+mkdir -p output
 cd macos
 ./unpack-prebuilts.sh
 echo "Compressing macOS package"

build-packages.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -e
 rm -rf output || true
-mkdir output
 ./build-linux-package.sh
 ./build-mac-package.sh

copy-shared-files.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 set -e
 cp -r ../sdkroot/* compiler/
-cp compiler/opt/swiftwasm-sdk/lib/swift/wasm/wasm32/glibc.modulemap compiler/extra_utils
+cp ../linux/compiler/opt/swiftwasm-sdk/lib/swift/wasm/wasm32/glibc.modulemap compiler/extra_utils

download-installable-prebuilts.sh

@@ -2,6 +2,6 @@
 set -e
 mkdir -p prebuilt
 cd prebuilt
-wget https://github.com/swiftwasm/swiftwasm-sdk/releases/download/20191112.1.linux/swiftwasm.tar.gz
+wget -O swiftwasm-linux.tar.gz https://github.com/swiftwasm/swiftwasm-sdk/releases/download/20191112.1.linux/swiftwasm.tar.gz
 # Mac specific
-wget https://github.com/swiftwasm/swiftwasm-sdk/releases/download/20191112.1.mac/swiftwasm-mac.tar.gz
+wget -O swiftwasm-macos.tar.gz https://github.com/swiftwasm/swiftwasm-sdk/releases/download/20191112.1.mac/swiftwasm-mac.tar.gz

linux/unpack-prebuilts.sh

@@ -5,7 +5,7 @@ mkdir swiftwasm-sdk
 ln -s swiftwasm-sdk compiler
 cd compiler
 untar="../../prebuilt/wasi-sdk-"*"-linux.tar.gz
-../../prebuilt/swiftwasm.tar.gz
+../../prebuilt/swiftwasm-linux.tar.gz
 ../../prebuilt/icu4c-wasi.tar.xz"
 for i in $untar
 do
@@ -15,6 +15,6 @@ done
 cd ..
 mv "compiler/wasi-sdk-"* "compiler/wasi-sdk"
 mv compiler/wasi-sdk/share/wasi-sysroot compiler/wasi-sdk/share/sysroot
-bash ../remove-swift-extra-files.sh || true
-bash ../remove-wasi-extra-files.sh || true
-bash ../copy-shared-files.sh || true
+../remove-swift-extra-files.sh || true
+../remove-wasi-extra-files.sh || true
+../copy-shared-files.sh || true

macos/unpack-prebuilts.sh

@@ -5,7 +5,7 @@ mkdir swiftwasm-sdk tmpdir
 ln -s swiftwasm-sdk compiler
 cd compiler
 untar="../../prebuilt/wasi-sdk-"*"-linux.tar.gz
-../../prebuilt/swiftwasm-mac.tar.gz
+../../prebuilt/swiftwasm-macos.tar.gz
 ../../prebuilt/icu4c-wasi.tar.xz"
 for i in $untar
 do
@@ -16,15 +16,15 @@ done
 cd ..
 cd tmpdir
 tar xf ../../prebuilt/clang+llvm-*-x86_64-darwin-apple.tar.xz
-tar xf ../../prebuilt/swiftwasm.tar.gz
+tar xf ../../prebuilt/swiftwasm-linux.tar.gz
 cd ..
 mv "compiler/wasi-sdk-"* "compiler/wasi-sdk"
 mv compiler/wasi-sdk/share/wasi-sysroot compiler/wasi-sdk/share/sysroot
-bash ../remove-swift-extra-files.sh || true
+../remove-swift-extra-files.sh || true
 rm -r compiler/wasi-sdk/bin
 mkdir compiler/wasi-sdk/bin
 cp tmpdir/clang+llvm-*-x86_64-darwin-apple/bin/wasm-ld compiler/wasi-sdk/bin
 cp -a tmpdir/opt/swiftwasm-sdk/lib/swift/wasm compiler/opt/swiftwasm-sdk/lib/swift/wasm
 cp -a tmpdir/opt/swiftwasm-sdk/lib/swift_static compiler/opt/swiftwasm-sdk/lib/swift_static
 # ok, finally copy over the shared files
-bash ../copy-shared-files.sh || true
+../copy-shared-files.sh || true

remove-swift-extra-files.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 basepath="compiler/opt/swiftwasm-sdk"
 filestoremove="bin/sil-* 
 bin/lldb*

remove-wasi-extra-files.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 basepath="compiler/wasi-sdk"
 filestoremove="bin/clang*
 bin/llvm*