fix tar_from_installation.sh and dist target

pull/126/head
Vladimir Vukicevic 6 years ago
parent 3307f2d802
commit 2bde8b98f7

1
.gitignore vendored

@ -1 +1,2 @@
build
dist

@ -193,7 +193,7 @@ package: build/package.BUILT
build/package.BUILT: build strip
mkdir -p dist
command -v dpkg-deb >/dev/null && ./deb_from_installation.sh $(shell pwd)/dist || true
./tar_from_installation.sh $(shell pwd)/dist
./tar_from_installation.sh "$(shell pwd)/dist" "$(VERSION)" "$(PATH_PREFIX)"
touch build/package.BUILT
.PHONY: default clean build strip package check

@ -1,15 +1,19 @@
#!/usr/bin/env bash
set -ex
OUTDIR=$PWD/dist
VERSION=`./version.sh`
INDIR=/opt/wasi-sdk
if [ -n "$1" ]; then
OUTDIR=$1
else
OUTDIR=$PWD/dist
fi
if [ -n "$2" ]; then
VERSION="$2"
else
VERSION=`./version.sh`
fi
if [ -n "$3" ]; then
INDIR="$3"
fi
PKGDIR=build/wasi-sdk-$VERSION
@ -23,7 +27,7 @@ case "$(uname -s)" in
esac
rm -rf $PKGDIR
cp -R /opt/wasi-sdk $PKGDIR
cp -R $INDIR $PKGDIR
cd build
tar czf $OUTDIR/wasi-sdk-$VERSION\-$MACHINE.tar.gz wasi-sdk-$VERSION

Loading…
Cancel
Save