Snap: Derive version from git describe

This commit is contained in:
Maximilian Federle
2019-07-08 14:27:44 +02:00
parent 5ef009092a
commit 968a68a2a3

View File

@@ -116,14 +116,11 @@ parts:
source: . source: .
override-pull: | override-pull: |
snapcraftctl pull snapcraftctl pull
if [ -d .git ]; then if ! git describe --dirty; then
revision=$(git svn find-rev HEAD) rc2_parent="a8789f7"
else git -c user.name="snapcraft" -c user.email="snapcraft@local.build" tag -a "0.7RC2" -m "stand-in tag" "$rc2_parent"
revision=$(svn --xml info | grep revision=\" | tail -1 | cut -d\" -f2)
fi fi
version=$(cat sources/qet.h |grep "const QString version" | cut -d\" -f2 | cut -d\" -f1) snap_version=$(git describe --dirty | sed -e 's/-/+git/;y/-/./')
displayed_version=$(cat sources/qet.h | grep displayedVersion | cut -d\" -f2 | cut -d\" -f1)
snap_version="$displayed_version~svn$revision"
modified_displayed_version=$snap_version".snap" modified_displayed_version=$snap_version".snap"
sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
snapcraftctl set-version "$snap_version" snapcraftctl set-version "$snap_version"
@@ -139,8 +136,6 @@ parts:
- libkf5widgetsaddons-dev - libkf5widgetsaddons-dev
- libkf5coreaddons-dev - libkf5coreaddons-dev
- git - git
- git-svn
- subversion
stage-packages: stage-packages:
- qtwayland5 - qtwayland5
- qt5-gtk-platformtheme - qt5-gtk-platformtheme