Skip to content

Commit

Permalink
remove --tags from git describe
Browse files Browse the repository at this point in the history
  • Loading branch information
lordofbikes committed Nov 28, 2021
1 parent 8d1116b commit eba1413
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CI/build-appimg.sh
Expand Up @@ -60,4 +60,4 @@ convert -resize 256x256 CI/librecad.svg appdir/usr/share/icons/hicolor/256x256/a
wget -c https://github.com/$(wget -q https://github.com/probonopd/go-appimage/releases -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)
chmod +x appimagetool-*.AppImage
./appimagetool-*.AppImage -s deploy appdir/usr/share/applications/librecad.desktop
VERSION=`git describe --tags` ./appimagetool-*.AppImage appdir/
VERSION=`git describe ` ./appimagetool-*.AppImage appdir/
4 changes: 2 additions & 2 deletions librecad/src/src.pro
Expand Up @@ -40,7 +40,7 @@ DESTDIR = $${INSTALLDIR}

# Make translations at the end of the process
unix {
LC_VERSION=$$system([ "$(which git)x" != "x" -a -d ../../.git ] && echo "$(git describe --tags)" || echo "$${LC_VERSION}")
LC_VERSION=$$system([ "$(which git)x" != "x" -a -d ../../.git ] && echo "$(git describe)" || echo "$${LC_VERSION}")

macx {
TARGET = LibreCAD
Expand Down Expand Up @@ -68,7 +68,7 @@ win32 {

# add MSYSGIT_DIR = PathToGitBinFolder (without quotes) in custom.pro file, for commit hash in about dialog
!isEmpty( MSYSGIT_DIR ) {
LC_VERSION = $$system( \"$$MSYSGIT_DIR/git.exe\" describe --tags || echo "$${LC_VERSION}")
LC_VERSION = $$system( \"$$MSYSGIT_DIR/git.exe\" describe || echo "$${LC_VERSION}")
}

RC_FILE = ../res/main/librecad.rc
Expand Down

0 comments on commit eba1413

Please sign in to comment.