X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=751802776c2470510d4c7919edbd2c5ebf2838b2;hb=80a149b82831defa1a9f724801daefda0a8c5685;hp=4ec8ad6286b8551b0f2947c222924bcadfa1588a;hpb=297a450e05e80e930d53631bb9ae2c3fe09378b7;p=jquery.git

diff --git a/Makefile b/Makefile
index 4ec8ad6..7518027 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ 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\
@@ -46,7 +47,7 @@ VER = sed s/@VERSION/${JQ_VER}/
 
 JAR = java -jar ${BUILD_DIR}/js.jar
 
-all: jquery lite pack docs test
+all: jquery lite min pack docs test speed
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
@@ -117,8 +118,6 @@ test: ${JQ}
 	@@echo " - Copying over script files."
 	@@cp -fR ${BUILD_DIR}/test/data ${TEST_DIR}/data
 	@@cp -f ${BUILD_DIR}/test/index.html ${TEST_DIR}
-	@@cp -f ${BUILD_DIR}/test/fx.html ${TEST_DIR}
-	@@cp -f ${BUILD_DIR}/test/cow.jpg ${TEST_DIR}
 
 	@@echo " - Compiling Test Cases"
 	@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
@@ -126,6 +125,13 @@ test: ${JQ}
 	@@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"
 
@@ -148,6 +154,21 @@ 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-1.1.2.js ${SPEED_DIR}
+
+	@@echo "Speed Test Suite Built"
+	@@echo
+
 clean:
 	@@echo "Removing Distribution directory:" ${DIST_DIR}
 	@@rm -rf ${DIST_DIR}
@@ -157,3 +178,6 @@ clean:
 
 	@@echo "Removing Documentation directory:" ${DOCS_DIR}
 	@@rm -rf ${DOCS_DIR}
+
+	@@echo "Removing Speed Test Suite directory:" ${SPEED_DIR}
+	@@rm -rf ${SPEED_DIR}