X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=ad7171fff881d9e16d11ec62539178d841701660;hb=89a9a747b603ae21945aa0cbcdf13560d3e7cea1;hp=f3f2688932f41740cb47b0a5d678053f42fba99a;hpb=4434b5ae65bd3ecb9ea5b7e6a56d5b714748de90;p=jquery.git

diff --git a/Makefile b/Makefile
index f3f2688..ad7171f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,14 @@ 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}/ajax/ajax.js
-	#${SRC_DIR}/fx/fx.js\
-	#${SRC_DIR}/ajax/ajax.js
+	${SRC_DIR}/ajax/ajax.js\
+	${SRC_DIR}/fx/fx.js
 
 PLUGINS = ${PLUG_DIR}/button/*\
 	${PLUG_DIR}/center/*\
@@ -47,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}:
@@ -118,6 +118,8 @@ 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}
@@ -125,6 +127,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"
 
@@ -147,6 +156,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}
@@ -156,3 +180,6 @@ clean:
 
 	@@echo "Removing Documentation directory:" ${DOCS_DIR}
 	@@rm -rf ${DOCS_DIR}
+
+	@@echo "Removing Speed Test Suite directory:" ${SPEED_DIR}
+	@@rm -rf ${SPEED_DIR}