Browse Source

mac build: call `git describe` after `git submodule update`

otherwise it could be that `git describe` will say "dirty" but the binary
will not actually be dirty as it just needed `git submodule update`
patch-4
SomberNight 4 years ago
parent
commit
756d2eb004
No known key found for this signature in database GPG Key ID: B33B5F232C6271E9
  1. 3
      contrib/osx/make_osx

3
contrib/osx/make_osx

@ -19,7 +19,6 @@ ROOT_FOLDER="$CONTRIB/.."
src_dir=$(dirname "$0")
cd $src_dir/../..
VERSION=`git describe --tags --dirty --always`
which brew > /dev/null 2>&1 || fail "Please install brew from https://brew.sh/ to continue"
which xcodebuild > /dev/null 2>&1 || fail "Please install Xcode and xcode command line tools to continue"
@ -156,6 +155,8 @@ for d in ~/Library/Python/ ~/.pyenv .; do
popd
done
VERSION=`git describe --tags --dirty --always`
info "Building binary"
APP_SIGN="$CODESIGN_CERT" pyinstaller --noconfirm --ascii --clean --name $VERSION contrib/osx/osx.spec || fail "Could not build binary"

Loading…
Cancel
Save