X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=9221e0881b9bb6978c2abee8208070e8c220765b;hb=7afe6dcc0837ac00cea7fbb7de6fb95b745148c2;hp=1ebc643d862a53e1959b485dbada6713f04b4cf4;hpb=1ce92e022ddd6f547515e855544ba3c2fb1416e0;p=jquery.git

diff --git a/Makefile b/Makefile
index 1ebc643..9221e08 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}/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,11 +41,10 @@ ${DIST_DIR}:
 
 init:
 	@@echo "Grabbing external dependencies..."
-	@@git submodule init
-	@@git submodule update
-	@@cd src/sizzle && git pull origin master
-	@@cd test/qunit && git pull origin master
-	@@git submodule update
+	@@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}
 
@@ -57,10 +57,7 @@ ${JQ}: ${MODULES}
 		sed 's/Date:./&'"${DATE}"'/' | \
 		${VER} > ${JQ};
 
-	@@echo ${JQ} "Built"
-	@@echo
-
-selector: init
+selector: 
 	@@echo "Building selector code from Sizzle"
 	@@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js > src/selector.js
 
@@ -69,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}
@@ -81,3 +75,6 @@ clean:
 
 	@@echo "Removing built copy of Sizzle"
 	@@rm src/selector.js
+
+	@@echo "Removing cloned directories"
+	@@rm -rf test/qunit src/sizzle