* Florian Bruhin <me _at_ the _minus_ compiler _dot_ org> [2013-06-20 21:52:11 +0200]: > * Florian Bruhin <me _at_ the _minus_ compiler _dot_ org> [2013-06-17 23:43:09 +0200]: > > Basically, if a .git directory exists, and git is in the users PATH, > > it will add a "(short-commit-id)" to "hc version": > > This patch by me introduced a problem with release.sh, because > "make tar" also added the git commit id to the tar filename. The > attached patch (let's see if it works this time!) fixes this. Okay, that one was my fault. -.- -- () ascii ribbon campaign - stop html mail www.asciiribbon.org /\ www.the-compiler.org | I love long mails http://email.is-not-s.ms/ The most important service rendered by the press is that of educating people to approach printed matter with distrust.
From a2813ff7c944f37f4e3bbd8246e1916bffe5b69f Mon Sep 17 00:00:00 2001 From: Florian Bruhin <git _at_ the _minus_ compiler _dot_ org> Date: Thu, 20 Jun 2013 21:46:45 +0200 Subject: [PATCH] Don't append git commit id for tar archives --- config.mk | 4 ++-- version.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config.mk b/config.mk index 1f7410a..a3cfd35 100644 --- a/config.mk +++ b/config.mk @@ -42,10 +42,10 @@ CONFIGDIR = $(SYSCONFDIR)/xdg/herbstluftwm XSESSIONSDIR = $(DATADIR)/xsessions ZSHCOMPLETIONDIR = $(DATADIR)/zsh/functions/Completion/X/ BASHCOMPLETIONDIR = $(SYSCONFDIR)/bash_completion.d/ -TARFILE = herbstluftwm-$(VERSION).tar.gz +TARFILE = herbstluftwm-$(SHORTVERSION).tar.gz A2X = a2x ASCIIDOC = asciidoc -TMPTARDIR = herbstluftwm-$(VERSION) +TMPTARDIR = herbstluftwm-$(SHORTVERSION) MKDIR = mkdir -p INSTALL = install RM = rm -f diff --git a/version.mk b/version.mk index ede426f..c79dde3 100644 --- a/version.mk +++ b/version.mk @@ -11,4 +11,5 @@ VERSION_GIT = \ \($(shell git rev-parse --short HEAD)\) endif endif VERSION_SUFFIX = "" -VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)$(VERSION_SUFFIX)$(VERSION_GIT) +SHORTVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)$(VERSION_SUFFIX) +VERSION = $(SHORTVERSION)$(VERSION_GIT) -- 1.8.3.1
Attachment:
pgpLJaGKucAFA.pgp
Description: PGP signature
Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev