git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switched from using YUI Compressor to Google Compiler. Minified and Gzipped filesize...
[jquery.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e9da144
..
a0dbd8b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-5,16
+5,17
@@
PREFIX = .
DIST_DIR = ${PREFIX}/dist
BASE_FILES = ${SRC_DIR}/core.js\
DIST_DIR = ${PREFIX}/dist
BASE_FILES = ${SRC_DIR}/core.js\
+ ${SRC_DIR}/support.js\
${SRC_DIR}/data.js\
${SRC_DIR}/data.js\
+ ${SRC_DIR}/queue.js\
${SRC_DIR}/event.js\
${SRC_DIR}/event.js\
- ${SRC_DIR}/support.js\
${SRC_DIR}/selector.js\
${SRC_DIR}/traversing.js\
${SRC_DIR}/attributes.js\
${SRC_DIR}/manipulation.js\
${SRC_DIR}/css.js\
${SRC_DIR}/ajax.js\
${SRC_DIR}/selector.js\
${SRC_DIR}/traversing.js\
${SRC_DIR}/attributes.js\
${SRC_DIR}/manipulation.js\
${SRC_DIR}/css.js\
${SRC_DIR}/ajax.js\
- ${SRC_DIR}/fx.js\
+ ${SRC_DIR}/effects.js\
${SRC_DIR}/offset.js\
${SRC_DIR}/dimensions.js
${SRC_DIR}/offset.js\
${SRC_DIR}/dimensions.js
@@
-28,7
+29,7
@@
JQ_MIN = ${DIST_DIR}/jquery.min.js
JQ_VER = `cat version.txt`
VER = sed s/@VERSION/${JQ_VER}/
JQ_VER = `cat version.txt`
VER = sed s/@VERSION/${JQ_VER}/
-MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
+MINJAR = java -jar ${BUILD_DIR}/google-compiler-20091218.jar
DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'`
DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'`
@@
-56,9
+57,6
@@
${JQ}: ${MODULES}
sed 's/Date:./&'"${DATE}"'/' | \
${VER} > ${JQ};
sed 's/Date:./&'"${DATE}"'/' | \
${VER} > ${JQ};
- @@echo ${JQ} "Built"
- @@echo
-
selector: init
@@echo "Building selector code from Sizzle"
@@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js > src/selector.js
selector: init
@@echo "Building selector code from Sizzle"
@@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js > src/selector.js
@@
-68,11
+66,8
@@
min: ${JQ_MIN}
${JQ_MIN}: ${JQ}
@@echo "Building" ${JQ_MIN}
${JQ_MIN}: ${JQ}
@@echo "Building" ${JQ_MIN}
- @@echo " - Compressing using Minifier"
- @@${MINJAR} ${JQ} > ${JQ_MIN}
-
- @@echo ${JQ_MIN} "Built"
- @@echo
+ @@head -15 ${JQ} > ${JQ_MIN}
+ @@${MINJAR} --js ${JQ} --warning_level QUIET >> ${JQ_MIN}
clean:
@@echo "Removing Distribution directory:" ${DIST_DIR}
clean:
@@echo "Removing Distribution directory:" ${DIST_DIR}
@@
-80,3
+75,6
@@
clean:
@@echo "Removing built copy of Sizzle"
@@rm src/selector.js
@@echo "Removing built copy of Sizzle"
@@rm src/selector.js
+
+ @@echo "Removing cloned directories"
+ @@rm -rf test/qunit src/sizzle