From: Asbjørn Sloth Tønnesen <ast@mugami.com>
Date: Wed, 30 Mar 2011 14:41:39 +0000 (+0000)
Subject: Makefile: get version from git
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;ds=sidebyside;h=36647696b69c208c3c965d0f04603e55e184b784;p=jquery.git

Makefile: get version from git

Pull the version number from git tags, rather than a text file in git.

Signed-off-by: Asbjørn Sloth Tønnesen <ast@mugami.com>
---

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