AaronFiore/electrum
1
0
Fork 0
Code Activity

mac build: call git describe after git submodule update

Browse Source 
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`
This commit is contained in:
SomberNight
2020-11-21 19:29:29 +01:00
parent 32ffc9e9a4
commit 756d2eb004
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/osx/make_osx
View File

@@ -19,7 +19,6 @@ ROOT_FOLDER="$CONTRIB/.."
src_dir=$(dirname "$0") src_dir=$(dirname "$0")
cd $src_dir/../.. 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 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" 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 popd
done done
VERSION=`git describe --tags --dirty --always`
info "Building binary" info "Building binary"
APP_SIGN="$CODESIGN_CERT" pyinstaller --noconfirm --ascii --clean --name $VERSION contrib/osx/osx.spec || fail "Could not build binary" APP_SIGN="$CODESIGN_CERT" pyinstaller --noconfirm --ascii --clean --name $VERSION contrib/osx/osx.spec || fail "Could not build binary"