trivial: debian: calculate version number using git describe again

This will be more representative of what the build actually is
rather than a mismarked tag.

If the checkout doesn't include a tag, fallback to parsing meson.build
though.
This commit is contained in:
Mario Limonciello 2017-06-26 09:40:41 -05:00
parent 3db79f2ec2
commit d97eb03b6b
3 changed files with 5 additions and 1 deletions

View File

@ -9,6 +9,7 @@ RUN apt-get install -yq --no-install-recommends \
fontconfig-config \ fontconfig-config \
fonts-dejavu \ fonts-dejavu \
gir1.2-pango-1.0 \ gir1.2-pango-1.0 \
git \
gcab \ gcab \
gettext \ gettext \
gobject-introspection \ gobject-introspection \

View File

@ -8,6 +8,7 @@ RUN apt-get install -yq --no-install-recommends \
fontconfig \ fontconfig \
fontconfig-config \ fontconfig-config \
fonts-dejavu \ fonts-dejavu \
git \
gcab \ gcab \
gettext \ gettext \
gir1.2-appstreamglib-1.0 \ gir1.2-appstreamglib-1.0 \

View File

@ -1,7 +1,9 @@
#!/bin/bash -e #!/bin/bash -e
#build deb packages #build deb packages
VERSION=`head meson.build | sed "/version :/!d; /meson/d; s/,//; s/'//g;" | awk -F ':' '{print $2}'` VERSION=`git describe | sed 's/-/+r/;s/-/+/'`
[ -z $VERSION ] && VERSION=`head meson.build | grep ' version :' | cut -d \' -f2`
rm -rf build/ rm -rf build/
mkdir -p build && pushd build mkdir -p build && pushd build
ln -s ../* . ln -s ../* .