Merge branch 'Sankore-1.40' of github.com:Sankore/Sankore-3.1 into Sankore-1.40

preferencesAboutTextFull
Anatoly Mihalchenko 13 years ago
commit d6ca049d9a
  1. 6
      release.linux.sh

@ -52,7 +52,7 @@ if [ ! -f $QT_GUI_TRANSLATIONS ]; then
exit 1 exit 1
else else
$LRELEASES $QT_GUI_TRANSLATIONS_PRO_FILE $LRELEASES $QT_GUI_TRANSLATIONS_PRO_FILE
elif fi
VERSION=`cat build/linux/release/version` VERSION=`cat build/linux/release/version`
if [ ! -f build/linux/release/version ]; then if [ ! -f build/linux/release/version ]; then
@ -62,8 +62,8 @@ else
LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`" LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`"
if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then
echo creating a tag with the version $VERSION echo creating a tag with the version $VERSION
git tag -a "v$VERSION" -m "Generating setup for v$VERSION" # git tag -a "v$VERSION" -m "Generating setup for v$VERSION"
git push origin --tags # git push origin --tags
fi fi
fi fi

Loading…
Cancel
Save