Moved from the old JSMin to using YUIMin for compressing the jQuery source. Additiona...

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index 64dd418..2d344c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,14 @@ SPEED_DIR = ${PREFIX}/speed
 PLUG_DIR = ../plugins
 
 BASE_FILES = ${SRC_DIR}/core.js\
+       ${SRC_DIR}/data.js\
+       ${SRC_DIR}/support.js\
        ${SRC_DIR}/selector.js\
        ${SRC_DIR}/event.js\
        ${SRC_DIR}/ajax.js\
        ${SRC_DIR}/fx.js\
-       ${SRC_DIR}/offset.js
+       ${SRC_DIR}/offset.js\
+       ${SRC_DIR}/dimensions.js
 
 PLUGINS = ${PLUG_DIR}/button/*\
        ${PLUG_DIR}/center/*\
@@ -47,6 +50,7 @@ JQ_VER = `cat version.txt`
 VER = sed s/@VERSION/${JQ_VER}/
 
 JAR = java -jar ${BUILD_DIR}/js.jar
+MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
 
 all: jquery lite min pack speed
        @@echo "jQuery build complete."
@@ -79,8 +83,7 @@ lite: ${JQ_LITE}
 ${JQ_LITE}: ${JQ}
        @@echo "Building" ${JQ_LITE}
 
-       @@echo " - Removing ScriptDoc from" ${JQ}
-       @@${JAR} ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
+       @@cp ${JQ} ${JQ_LITE}
 
        @@echo ${JQ_LITE} "Built"
        @@echo
@@ -102,7 +105,7 @@ ${JQ_MIN}: ${JQ}
        @@echo "Building" ${JQ_MIN}
 
        @@echo " - Compressing using Minifier"
-       @@${JAR} ${BUILD_DIR}/build/min.js ${JQ} ${JQ_MIN}
+       @@${MINJAR} ${JQ} > ${JQ_MIN}
 
        @@echo ${JQ_MIN} "Built"
        @@echo
@@ -151,7 +154,7 @@ speed: ${JQ}
        @@cp -f ${BUILD_DIR}/speed/index.html ${SPEED_DIR}
        @@cp -f ${BUILD_DIR}/speed/benchmarker.css ${SPEED_DIR}
        @@cp -f ${BUILD_DIR}/speed/benchmarker.js ${SPEED_DIR}
-       @@cp -f ${BUILD_DIR}/speed/jquery-1.1.2.js ${SPEED_DIR}
+       @@cp -f ${BUILD_DIR}/speed/jquery-basis.js ${SPEED_DIR}
 
        @@echo "Speed Test Suite Built"
        @@echo
@@ -160,9 +163,6 @@ clean:
        @@echo "Removing Distribution directory:" ${DIST_DIR}
        @@rm -rf ${DIST_DIR}
 
-       @@echo "Removing Test Suite directory:" ${TEST_DIR}
-       @@rm -rf ${TEST_DIR}
-
        @@echo "Removing Documentation directory:" ${DOCS_DIR}
        @@rm -rf ${DOCS_DIR}