Browse Source

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>
master
Richard Levitte 7 years ago
parent
commit
382af61f62
2 changed files with 11 additions and 1 deletions
  1. +10
    -0
      .travis-create-release.sh
  2. +1
    -1
      .travis.yml

+ 10
- 0
.travis-create-release.sh View File

@ -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

+ 1
- 1
.travis.yml View File

@ -68,7 +68,7 @@ matrix:
env: CONFIG_OPTS="--debug --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


Loading…
Cancel
Save