comparison build.sh @ 67:c87212fe8883

Renamed debian directory to prepare for debian packaging, fixed possible crash in PI mode 2
author Ivo Smits <Ivo@UCIS.nl>
date Fri, 27 Jan 2017 20:33:19 +0100
parents e0bd3a4993c2
children 36b9f18509db
comparison
equal deleted inserted replaced
66:9499cbd71871 67:c87212fe8883
23 rm -rf out/ obj/ tmp/ 23 rm -rf out/ obj/ tmp/
24 24
25 mkdir -p out 25 mkdir -p out
26 if [ "$1" != "debian" ]; then 26 if [ "$1" != "debian" ]; then
27 echo Creating source archive... 27 echo Creating source archive...
28 $tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" build.sh clean.sh debian src version --exclude "debian/data" 28 $tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" build.sh clean.sh deb src version --exclude "debian/data"
29 fi 29 fi
30 30
31 mkdir -p obj tmp tmp/include tmp/lib 31 mkdir -p obj tmp tmp/include tmp/lib
32 32
33 export LIBRARY_PATH="/usr/local/lib/:${LIBRARY_PATH}" 33 export LIBRARY_PATH="/usr/local/lib/:${LIBRARY_PATH}"
80 echo Building debian binary... 80 echo Building debian binary...
81 $cc $CFLAGS -c -DCOMBINED_BINARY -DDEBIAN_BINARY src/run.combined.c -o obj/run.debian.o 81 $cc $CFLAGS -c -DCOMBINED_BINARY -DDEBIAN_BINARY src/run.combined.c -o obj/run.debian.o
82 $cc $CFLAGS -o out/quicktun.debian obj/common.o obj/run.debian.o obj/proto.raw.o obj/proto.nacl0.o obj/proto.nacltai.o obj/proto.salty.o -l$CRYPTLIB $LDFLAGS 82 $cc $CFLAGS -o out/quicktun.debian obj/common.o obj/run.debian.o obj/proto.raw.o obj/proto.nacl0.o obj/proto.nacltai.o obj/proto.salty.o -l$CRYPTLIB $LDFLAGS
83 if [ "$1" != "debian" -a -x /usr/bin/dpkg-deb -a -x /usr/bin/fakeroot ]; then 83 if [ "$1" != "debian" -a -x /usr/bin/dpkg-deb -a -x /usr/bin/fakeroot ]; then
84 echo -n Building debian package... 84 echo -n Building debian package...
85 cd debian 85 cd deb
86 ./build.sh 86 ./build.sh
87 cd .. 87 cd ..
88 fi 88 fi
89 fi 89 fi
90 90