From: Asbjørn Sloth Tønnesen <ast@mugami.com>
Date: Wed, 30 Mar 2011 14:50:28 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/jquery/jquery into fixedbuild
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=refs%2Fheads%2Ffixedbuild;hp=2555a5a2322f78fc1cfc8a0f2b55580fc79d2f32;p=jquery.git

Merge branch 'master' of git://github.com/jquery/jquery into fixedbuild
---

diff --git a/Makefile b/Makefile
index 2c7bb80..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)
 
@@ -68,7 +68,7 @@ ${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js
 lint: jquery
 	@@if test ! -z ${JS_ENGINE}; then \
 		echo "Checking jQuery against JSLint..."; \
-		${JS_ENGINE} build/jslint-check.js; \
+		${JS_ENGINE} build/jslint-check.js ${JQ}; \
 	else \
 		echo "You must have NodeJS installed in order to test jQuery against JSLint."; \
 	fi
diff --git a/build/jslint-check.js b/build/jslint-check.js
index 72d6701..95224be 100644
--- a/build/jslint-check.js
+++ b/build/jslint-check.js
@@ -1,6 +1,8 @@
 var JSLINT = require("./lib/jslint").JSLINT,
 	print = require("sys").print,
-	src = require("fs").readFileSync("dist/jquery.js", "utf8");
+	args = process.argv,
+	filename = args[2],
+	src = require("fs").readFileSync(filename, "utf8");
 
 JSLINT(src, { evil: true, forin: true, maxerr: 100 });
 
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