git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor fix to Makefile so that 'make clean' doesn't fail when run immediately after...
[jquery.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e026d9e
..
0fff724
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-32,7
+32,7
@@
VER = sed s/@VERSION/${JQ_VER}/
RHINO = java -jar ${BUILD_DIR}/js.jar
MINJAR = java -jar ${BUILD_DIR}/google-compiler-20091218.jar
RHINO = java -jar ${BUILD_DIR}/js.jar
MINJAR = java -jar ${BUILD_DIR}/google-compiler-20091218.jar
-DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'`
+DATE=`git log -1 --pretty=format:%ad`
all: jquery lint min
@@echo "jQuery build complete."
all: jquery lint min
@@echo "jQuery build complete."
@@
-61,7
+61,7
@@
${JQ}: selector ${MODULES}
selector: ${DIST_DIR} init
@@echo "Building selector code from Sizzle"
selector: ${DIST_DIR} init
@@echo "Building selector code from Sizzle"
- @@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js > src/selector.js
+ @@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js | grep -v window.Sizzle > src/selector.js
lint: ${JQ}
@@echo "Checking jQuery against JSLint..."
lint: ${JQ}
@@echo "Checking jQuery against JSLint..."
@@
-80,7
+80,7
@@
clean:
@@rm -rf ${DIST_DIR}
@@echo "Removing built copy of Sizzle"
@@rm -rf ${DIST_DIR}
@@echo "Removing built copy of Sizzle"
- @@rm src/selector.js
+ @@rm -f src/selector.js
@@echo "Removing cloned directories"
@@rm -rf test/qunit src/sizzle
@@echo "Removing cloned directories"
@@rm -rf test/qunit src/sizzle