X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=972cb4db266f52cb318f33b94deac6cb688e84c7;hb=8e53f7b5d6716e60d8c8ea7e167f2b187aae9d89;hp=e9da1449c7550ce3dba565e000f56b312219a556;hpb=d605b8ee5667e4c26cf9c89f743e681938139162;p=jquery.git

diff --git a/Makefile b/Makefile
index e9da144..972cb4d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,17 @@ PREFIX = .
 DIST_DIR = ${PREFIX}/dist
 
 BASE_FILES = ${SRC_DIR}/core.js\
+	${SRC_DIR}/support.js\
 	${SRC_DIR}/data.js\
+	${SRC_DIR}/queue.js\
+	${SRC_DIR}/attributes.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}/fx.js\
+	${SRC_DIR}/effects.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}/
 
-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/[^:]*: *//'`
 
@@ -40,10 +41,10 @@ ${DIST_DIR}:
 
 init:
 	@@echo "Grabbing external dependencies..."
-	@@if test ! -d test/qunit; then git clone git://github.com/jquery/qunit.git test/qunit; fi
-	@@if test ! -d src/sizzle; then git clone git://github.com/jeresig/sizzle.git src/sizzle; fi
-	@@cd src/sizzle && git pull origin master &> /dev/null
-	@@cd test/qunit && git pull origin master &> /dev/null
+	@@if test ! -d test/qunit/.git; then git clone git://github.com/jquery/qunit.git test/qunit; fi
+	@@if test ! -d src/sizzle/.git; then git clone git://github.com/jeresig/sizzle.git src/sizzle; fi
+	@@cd src/sizzle && git pull origin master > /dev/null 2>&1
+	@@cd test/qunit && git pull origin master > /dev/null 2>&1
 
 jquery: ${DIST_DIR} selector ${JQ}
 
@@ -56,9 +57,6 @@ ${JQ}: ${MODULES}
 		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
@@ -68,11 +66,8 @@ min: ${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}
@@ -80,3 +75,6 @@ clean:
 
 	@@echo "Removing built copy of Sizzle"
 	@@rm src/selector.js
+
+	@@echo "Removing cloned directories"
+	@@rm -rf test/qunit src/sizzle