Mercurial > hg > quicktun
changeset 48:f80422b612ab
Abort build scripts on error, added quicktun (main) executable
| author | Ivo Smits <Ivo@UCIS.nl> |
|---|---|
| date | Fri, 24 May 2013 17:14:51 +0200 |
| parents | e896392f7e03 |
| children | b4de2326e9f7 |
| files | build.sh debian/build.sh |
| diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/build.sh Fri May 24 17:14:10 2013 +0200 +++ b/build.sh Fri May 24 17:14:51 2013 +0200 @@ -1,4 +1,5 @@ #!/bin/sh +set -e if [ "$(uname -s)" = "OpenBSD" -o "$(uname -s)" = "FreeBSD" -o "$(uname -s)" = "NetBSD" ]; then echo "Detected *BSD" @@ -63,6 +64,7 @@ gcc $CFLAGS -c -DCOMBINED_BINARY src/run.combined.c -o obj/run.combined.o gcc $CFLAGS -c src/common.c -o obj/common.o gcc $CFLAGS -o out/quicktun.combined obj/common.o obj/run.combined.o obj/proto.raw.o obj/proto.nacl0.o obj/proto.nacltai.o obj/proto.salty.o -lnacl $LDFLAGS +ln out/quicktun.combined out/quicktun echo Building single protocol binaries... gcc $CFLAGS -o out/quicktun.raw src/proto.raw.c $LDFLAGS
--- a/debian/build.sh Fri May 24 17:14:10 2013 +0200 +++ b/debian/build.sh Fri May 24 17:14:51 2013 +0200 @@ -1,4 +1,5 @@ #!/bin/sh +set -e VERSION=`cat ../version`-0 ARCH=`dpkg --print-architecture` rm -r data 2>/dev/null @@ -14,5 +15,6 @@ cp ../out/quicktun.nacltai data/usr/sbin/ cp ../out/quicktun.debian data/usr/sbin/ cp ../out/quicktun.keypair data/usr/sbin/ +cp ../out/quicktun data/usr/sbin/ fakeroot dpkg-deb --build data quicktun-${VERSION}_${ARCH}.deb mv quicktun*.deb ../out/