From 36647696b69c208c3c965d0f04603e55e184b784 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= Date: Wed, 30 Mar 2011 14:41:39 +0000 Subject: [PATCH] Makefile: get version from git MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Pull the version number from git tags, rather than a text file in git. Signed-off-by: Asbjørn Sloth Tønnesen --- Makefile | 4 ++-- version.txt | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 version.txt diff --git a/Makefile b/Makefile index eb50643..6927dbf 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,8 @@ JQ_MIN = ${DIST_DIR}/jquery.min.js SIZZLE_DIR = ${SRC_DIR}/sizzle -JQ_VER = $(shell cat version.txt) -VER = sed "s/@VERSION/${JQ_VER}/" +GIT_VER = $(shell git describe --tags --always --dirty) +VER = sed "s/@VERSION/${GIT_VER}/" DATE=$(shell git log -1 --pretty=format:%ad) diff --git a/version.txt b/version.txt deleted file mode 100644 index 0b76750..0000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -1.5.2pre \ No newline at end of file -- 1.7.10.4