Mercurial > hg > quicktun

comparison build.sh @ 65:e0bd3a4993c2 V2.2.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Release version 2.2.5 with small changes for debian packaging
author Ivo Smits <Ivo@UFO-Net.nl>
date Tue, 24 Jan 2017 21:59:02 +0100
parents fa53d1c54886
children c87212fe8883
comparison
equal deleted inserted replaced
64:fa53d1c54886 65:e0bd3a4993c2
21 21
22 echo Cleaning up... 22 echo Cleaning up...
23 rm -rf out/ obj/ tmp/ 23 rm -rf out/ obj/ tmp/
24 24
25 mkdir -p out 25 mkdir -p out
26 echo Creating source archive... 26 if [ "$1" != "debian" ]; then
27 $tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" build.sh clean.sh debian src version --exclude "debian/data" 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"
29 fi
28 30
29 mkdir -p obj tmp tmp/include tmp/lib 31 mkdir -p obj tmp tmp/include tmp/lib
30 32
31 export LIBRARY_PATH="/usr/local/lib/:${LIBRARY_PATH}" 33 export LIBRARY_PATH="/usr/local/lib/:${LIBRARY_PATH}"
32 34
33 echo '#include <sodium/crypto_box_curve25519xsalsa20poly1305.h>' > tmp/libtest1.c 35 echo '#include <sodium/crypto_box_curve25519xsalsa20poly1305.h>' > tmp/libtest1.c
34 echo '#include <nacl/crypto_box_curve25519xsalsa20poly1305.h>' > tmp/libtest2.c 36 echo '#include <nacl/crypto_box_curve25519xsalsa20poly1305.h>' > tmp/libtest2.c
35 if $cc -shared -lsodium tmp/libtest1.c -o tmp/libtest 2>/dev/null; then 37 if [ "$1" = "debian" ] || $cc -shared -lsodium tmp/libtest1.c -o tmp/libtest 2>/dev/null; then
36 echo Using shared libsodium. 38 echo Using shared libsodium.
37 echo '#include <sodium/crypto_box_curve25519xsalsa20poly1305.h>' > tmp/include/crypto_box_curve25519xsalsa20poly1305.h 39 echo '#include <sodium/crypto_box_curve25519xsalsa20poly1305.h>' > tmp/include/crypto_box_curve25519xsalsa20poly1305.h
38 echo '#include <sodium/crypto_scalarmult_curve25519.h>' > tmp/include/crypto_scalarmult_curve25519.h 40 echo '#include <sodium/crypto_scalarmult_curve25519.h>' > tmp/include/crypto_scalarmult_curve25519.h
39 export CPATH="./tmp/include/:${CPATH}" 41 export CPATH="./tmp/include/:${CPATH}"
40 export CRYPTLIB="sodium" 42 export CRYPTLIB="sodium"
72 $cc $CFLAGS -o out/quicktun.nacl0 src/proto.nacl0.c -l$CRYPTLIB $LDFLAGS 74 $cc $CFLAGS -o out/quicktun.nacl0 src/proto.nacl0.c -l$CRYPTLIB $LDFLAGS
73 $cc $CFLAGS -o out/quicktun.nacltai src/proto.nacltai.c -l$CRYPTLIB $LDFLAGS 75 $cc $CFLAGS -o out/quicktun.nacltai src/proto.nacltai.c -l$CRYPTLIB $LDFLAGS
74 $cc $CFLAGS -o out/quicktun.salty src/proto.salty.c -l$CRYPTLIB $LDFLAGS 76 $cc $CFLAGS -o out/quicktun.salty src/proto.salty.c -l$CRYPTLIB $LDFLAGS
75 $cc $CFLAGS -o out/quicktun.keypair src/keypair.c -l$CRYPTLIB $LDFLAGS 77 $cc $CFLAGS -o out/quicktun.keypair src/keypair.c -l$CRYPTLIB $LDFLAGS
76 78
77 if [ -f /etc/network/interfaces ]; then 79 if [ -f /etc/network/interfaces -o "$1" = "debian" ]; then
78 echo Building debian binary... 80 echo Building debian binary...
79 $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
80 $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
81 if [ -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
82 echo -n Building debian package... 84 echo -n Building debian package...
83 cd debian 85 cd debian
84 ./build.sh 86 ./build.sh
85 cd .. 87 cd ..
86 fi 88 fi