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

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index 4fc64b9..2d344c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,18 @@ PREFIX = .
 DOCS_DIR = ${PREFIX}/docs
 TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
+SPEED_DIR = ${PREFIX}/speed
 PLUG_DIR = ../plugins
 
-BASE_FILES = ${SRC_DIR}/jquery/jquery.js\
-       ${SRC_DIR}/selector/selector.js\
-       ${SRC_DIR}/event/event.js\
-       ${SRC_DIR}/fx/fx.js\
-       ${SRC_DIR}/ajax/ajax.js
+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}/dimensions.js
 
 PLUGINS = ${PLUG_DIR}/button/*\
        ${PLUG_DIR}/center/*\
@@ -38,14 +43,16 @@ MODULES_WITH_PLUGINS = ${SRC_DIR}/intro.js\
 
 JQ = ${DIST_DIR}/jquery.js
 JQ_LITE = ${DIST_DIR}/jquery.lite.js
+JQ_MIN = ${DIST_DIR}/jquery.min.js
 JQ_PACK = ${DIST_DIR}/jquery.pack.js
 
 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 pack docs test
+all: jquery lite min pack speed
        @@echo "jQuery build complete."
 
 ${DIST_DIR}:
@@ -76,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
@@ -93,25 +99,29 @@ ${JQ_PACK}: ${JQ}
        @@echo ${JQ_PACK} "Built"
        @@echo
 
-test: ${JQ}
-       @@echo "Building Test Suite"
+min: ${JQ_MIN}
 
-       @@echo " - Making Test Suite Directory:" ${TEST_DIR}
-       @@mkdir -p ${TEST_DIR}
+${JQ_MIN}: ${JQ}
+       @@echo "Building" ${JQ_MIN}
 
-       @@echo " - Removing any old tests"
-       @@rm -f ${TEST_DIR}/tests/*
+       @@echo " - Compressing using Minifier"
+       @@${MINJAR} ${JQ} > ${JQ_MIN}
 
-       @@echo " - Copying over script files."
-       @@cp -fR ${BUILD_DIR}/test/data ${TEST_DIR}/data
-       @@cp -f ${BUILD_DIR}/test/index.html ${TEST_DIR}
-
-       @@echo " - Compiling Test Cases"
-       @@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
+       @@echo ${JQ_MIN} "Built"
+       @@echo
 
+test: ${JQ}
+       @@echo "Building Test Suite"
        @@echo "Test Suite Built"
        @@echo
 
+runtest: ${JQ} test
+       @@echo "Running Automated Test Suite"
+       @@${JAR} ${BUILD_DIR}/runtest/test.js
+
+       @@echo "Test Suite Finished"
+       @@echo
+
 docs: ${JQ}
        @@echo "Building Documentation"
 
@@ -134,12 +144,27 @@ docs: ${JQ}
        @@echo "Documentation Built"
        @@echo
 
+speed: ${JQ}
+       @@echo "Building Speed Test Suite"
+
+       @@echo " - Making Speed Test Suite Directory:" ${SPEED_DIR}
+       @@mkdir -p ${SPEED_DIR}
+
+       @@echo " - Copying over script files."
+       @@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-basis.js ${SPEED_DIR}
+
+       @@echo "Speed Test Suite Built"
+       @@echo
+
 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}
+
+       @@echo "Removing Speed Test Suite directory:" ${SPEED_DIR}
+       @@rm -rf ${SPEED_DIR}