X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=e11ea5d2781f8a9c96973b509ddb62b4b79f2a1c;hb=87284a8ee751e1b4bb4a1ed96cdb92cb938d5f04;hp=5b2cae8d9eebf13d9b92df0672c1fd7283f1eda4;hpb=fc5ab8d6557884d275ba91795d208df635b6bff5;p=jquery.git

diff --git a/Makefile b/Makefile
index 5b2cae8..e11ea5d 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,20 @@ DOCS_DIR = ${PREFIX}/docs
 TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
 
-MODULES = jquery event fx ajax
+MODULES = ${SRC_DIR}/intro.js\
+	${SRC_DIR}/jquery/*\
+	${SRC_DIR}/event/*\
+	${SRC_DIR}/fx/*\
+	${SRC_DIR}/ajax/*\
+	${SRC_DIR}/outro.js
+
 JQ = ${DIST_DIR}/jquery.js
 JQ_LITE = ${DIST_DIR}/jquery.lite.js
 JQ_PACK = ${DIST_DIR}/jquery.pack.js
 
-all: jquery lite pack docs
+JAR = java -jar ${BUILD_DIR}/js.jar
+
+all: jquery lite pack docs test
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
@@ -19,36 +27,55 @@ ${DIST_DIR}:
 
 jquery: ${DIST_DIR} ${JQ}
 
-${JQ}:
+${JQ}: ${MODULES}
 	@@echo "Building" ${JQ}
 
-	@@for f in ${MODULES}; do \
-		echo " - Adding module:" $$f;\
-		cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
-	done
+	@@mkdir -p ${DIST_DIR}
+	@@cat ${MODULES} > ${JQ};
 
-	@@echo ${JQ} "built."
+	@@echo ${JQ} "Built"
 	@@echo
 
 lite: ${JQ_LITE}
 
-${JQ_LITE}: jquery
+${JQ_LITE}: ${JQ}
 	@@echo "Building" ${JQ_LITE}
+
 	@@echo " - Removing ScriptDoc from" ${JQ}
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/lite.js ${JQ} ${JQ_LITE}
-	@@echo ${JQ_LITE} "built."
+	@@${JAR} ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
+
+	@@echo ${JQ_LITE} "Built"
 	@@echo
 
 pack: ${JQ_PACK}
 
-${JQ_PACK}: jquery
+${JQ_PACK}: ${JQ}
 	@@echo "Building" ${JQ_PACK}
+
 	@@echo " - Compressing using Packer"
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build.js ${JQ} ${JQ_PACK}
-	@@echo ${JQ_PACK} "built."
+	@@${JAR} ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
+
+	@@echo ${JQ_PACK} "Built"
 	@@echo
 
 test: ${JQ}
+	@@echo "Building Test Suite"
+
+	@@echo " - Making Test Suite Directory:" ${TEST_DIR}
+	@@mkdir -p ${TEST_DIR}
+
+	@@echo " - Removing any old tests"
+	@@rm -f ${TEST_DIR}/tests/*
+
+	@@echo " - Copying over script files."
+	@@cp -fR ${BUILD_DIR}/test/js ${TEST_DIR}/js
+	@@cp -f ${BUILD_DIR}/test/index.html ${TEST_DIR}
+
+	@@echo " - Compiling Test Cases"
+	@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
+
+	@@echo "Test Suite Built"
+	@@echo
 
 docs: ${JQ}
 	@@echo "Building Documentation"
@@ -58,17 +85,23 @@ docs: ${JQ}
 	@@mkdir -p ${DOCS_DIR}/data
 
 	@@echo " - Copying over script files."
-	@@cp -R ${BUILD_DIR}/docs/js ${DOCS_DIR}/js
+	@@cp -fR ${BUILD_DIR}/docs/js ${DOCS_DIR}/js
 
 	@@echo " - Copying over style files."
-	@@cp -R ${BUILD_DIR}/docs/style ${DOCS_DIR}/style
+	@@cp -fR ${BUILD_DIR}/docs/style ${DOCS_DIR}/style
 
 	@@echo " - Extracting ScriptDoc from" ${JQ}
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/docs.js ${JQ} ${DOCS_DIR}
+	@@${JAR} ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
 
-	@@echo "Documentation built."
+	@@echo "Documentation 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}