aboutsummaryrefslogtreecommitdiff
path: root/update.sh
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2014-12-06 18:59:25 -0600
committerBrent Cook <bcook@openbsd.org>2014-12-06 18:59:25 -0600
commit976f64d932bc5fac8d18dd95feddcfb4f3782551 (patch)
tree649dc41764f1fdf66e69f24dd53eb978f6181b67 /update.sh
parent14f4175b67a8cd6c01955340b4e20d75e4e25708 (diff)
downloadportable-976f64d932bc5fac8d18dd95feddcfb4f3782551.tar.gz
portable-976f64d932bc5fac8d18dd95feddcfb4f3782551.tar.bz2
portable-976f64d932bc5fac8d18dd95feddcfb4f3782551.zip
read all library versions directly from files
This makes building and testing easier because the library Makefile.am files are use directly rather than as templates. Thanks to Wouter Clarie for the idea.
Diffstat (limited to 'update.sh')
-rwxr-xr-xupdate.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/update.sh b/update.sh
index a4a938d..47e2e22 100755
--- a/update.sh
+++ b/update.sh
@@ -31,14 +31,17 @@ openssl_app_src=$dir/openbsd/src/usr.bin/openssl
31source $libcrypto_src/crypto/shlib_version 31source $libcrypto_src/crypto/shlib_version
32libcrypto_version=$major:$minor:0 32libcrypto_version=$major:$minor:0
33echo "libcrypto version $libcrypto_version" 33echo "libcrypto version $libcrypto_version"
34echo $libcrypto_version > crypto/VERSION
34 35
35source $libssl_src/ssl/shlib_version 36source $libssl_src/ssl/shlib_version
36libssl_version=$major:$minor:0 37libssl_version=$major:$minor:0
37echo "libssl version $libssl_version" 38echo "libssl version $libssl_version"
39echo $libssl_version > ssl/VERSION
38 40
39source $libtls_src/shlib_version 41source $libtls_src/shlib_version
40libtls_version=$major:$minor:0 42libtls_version=$major:$minor:0
41echo "libtls version $libtls_version" 43echo "libtls version $libtls_version"
44echo $libtls_version > tls/VERSION
42 45
43CP='cp -p' 46CP='cp -p'
44 47
@@ -91,8 +94,6 @@ copy_hdrs ssl "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"
91 94
92# copy libcrypto source 95# copy libcrypto source
93rm -f crypto/*.c crypto/*.h 96rm -f crypto/*.c crypto/*.h
94sed -e "s/libcrypto-version/${libcrypto_version}/" \
95 crypto/Makefile.am.tpl > crypto/Makefile.am
96for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do 97for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do
97 dir=`dirname $i` 98 dir=`dirname $i`
98 mkdir -p crypto/$dir 99 mkdir -p crypto/$dir
@@ -107,7 +108,6 @@ $CP crypto/compat/ui_openssl_win.c crypto/ui
107 108
108# copy libtls source 109# copy libtls source
109rm -f tls/*.c tls/*.h 110rm -f tls/*.c tls/*.h
110sed -e "s/libtls-version/${libtls_version}/" tls/Makefile.am.tpl > tls/Makefile.am
111for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do 111for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do
112 cp $libtls_src/$i tls 112 cp $libtls_src/$i tls
113done 113done
@@ -123,7 +123,6 @@ done
123 123
124# copy libssl source 124# copy libssl source
125rm -f ssl/*.c ssl/*.h 125rm -f ssl/*.c ssl/*.h
126sed -e "s/libssl-version/${libssl_version}/" ssl/Makefile.am.tpl > ssl/Makefile.am
127for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do 126for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do
128 cp $libssl_src/src/ssl/$i ssl 127 cp $libssl_src/src/ssl/$i ssl
129done 128done