Reorganzing the jQuery source (first phase).

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index eac1648..e9a977c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,13 +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
+BASE_FILES = ${SRC_DIR}/core.js\
+       ${SRC_DIR}/selector.js\
+       ${SRC_DIR}/event.js\
+       ${SRC_DIR}/ajax.js\
+       ${SRC_DIR}/fx.js
 
 PLUGINS = ${PLUG_DIR}/button/*\
        ${PLUG_DIR}/center/*\
@@ -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 speed
        @@echo "jQuery build complete."
 
 ${DIST_DIR}:
@@ -109,21 +110,28 @@ test: ${JQ}
        @@echo "Building Test Suite"
 
        @@echo " - Making Test Suite Directory:" ${TEST_DIR}
-       @@mkdir -p ${TEST_DIR}
+       #@@mkdir -p ${TEST_DIR}
 
        @@echo " - Removing any old tests"
-       @@rm -f ${TEST_DIR}/tests/*
+       #@@rm -f ${TEST_DIR}/tests/*
 
        @@echo " - Copying over script files."
-       @@cp -fR ${BUILD_DIR}/test/data ${TEST_DIR}/data
-       @@cp -f ${BUILD_DIR}/test/index.html ${TEST_DIR}
+       #@@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}
+       #@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
 
        @@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"
 
@@ -146,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}
@@ -155,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}