diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-12-08 12:43:05 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-12-08 21:06:18 +0100 |
| commit | 02d013e6213b57bf23ba70373f634feb8532a5f3 (patch) | |
| tree | 98ed9f1230b74301c71d66ebdc3d8389fa5c607c | |
| parent | 89cd4fb5e9ff1018fd5502dc10de2be8ce0cccd8 (diff) | |
Adapt the OS X build to use the OS X tar
As part of this, move release creation to a script to be called from
.travis.yml. That makes it much easier to test outside of travis.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 382af61f6213e975b4c2a50fd8b9fedd23d86ab5)
| -rw-r--r-- | .travis-create-release.sh | 10 | ||||
| -rw-r--r-- | .travis.yml | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/.travis-create-release.sh b/.travis-create-release.sh new file mode 100644 index 0000000000..0404fc1248 --- /dev/null +++ b/.travis-create-release.sh @@ -0,0 +1,10 @@ +#! /bin/sh + +# $1 is expected to be $TRAVIS_OS_NAME + +if [ "$1" == osx ]; then + make -f Makefile.org \ + DISTTARVARS="NAME=_srcdist TAR_COMMAND='\$\$(TAR) \$\$(TARFLAGS) -s \"|^|\$\$(NAME)/|\" -T \$\$(TARFILE).list -cvf -' TARFLAGS='-n' TARFILE=_srcdist.tar" SHELL='sh -vx' dist +else + make -f Makefile.org DISTTARVARS='TARFILE=_srcdist.tar NAME=_srcdist' SHELL='sh -v' dist +fi diff --git a/.travis.yml b/.travis.yml index 6a2d745a15..c46716bfc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ matrix: env: CONFIG_OPTS="-d --strict-warnings" before_script: - - make -f Makefile.org TARFILE=_srcdist.tar NAME=_srcdist dist + - sh .travis-create-release.sh $TRAVIS_OS_NAME - tar -xvzf _srcdist.tar.gz - cd _srcdist - if [ "$CC" == i686-w64-mingw32-gcc ]; then |