liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gtk3

Browse Source
This commit is contained in:
Beep6581
2016-03-07 18:00:35 +01:00
parent f0679e8eee 0e0f5dd80d
commit a563427d59
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/osx/macosx_bundle.sh
View File

@@ -34,7 +34,7 @@ fi
# update project version # update project version
if test -x "$(which git)" -a -d "${PROJECT_SOURCE_DIR}/.git"; then if test -x "$(which git)" -a -d "${PROJECT_SOURCE_DIR}/.git"; then
# This is what the version ought to look like to be accurate in the git universe: # This is what the version ought to look like to be accurate in the git universe:
PROJECT_FULL_VERSION="$(git describe --tags --always)_$(git symbolic-ref --short -q HEAD)" PROJECT_FULL_VERSION="$(git describe --tags --always | sed 's/-g.*//')_$(git symbolic-ref --short -q HEAD)"
# outputs: 4.2-677-g904467b_master # outputs: 4.2-677-g904467b_master
# but Apple requirements https://goo.gl/eWDQv6 state we should use this: # but Apple requirements https://goo.gl/eWDQv6 state we should use this:
PROJECT_VERSION="$(git describe --tags --always | sed -e 's/-g.*//' -e 's/-/./')" PROJECT_VERSION="$(git describe --tags --always | sed -e 's/-g.*//' -e 's/-/./')"