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

diff --git a/Makefile b/Makefile
index 5b2cae8..f0be47f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@ JQ = ${DIST_DIR}/jquery.js
 JQ_LITE = ${DIST_DIR}/jquery.lite.js
 JQ_PACK = ${DIST_DIR}/jquery.pack.js
 
+JAR = java -jar ${BUILD_DIR}/js.jar
+
 all: jquery lite pack docs
 	@@echo "jQuery build complete."
 
@@ -27,7 +29,7 @@ ${JQ}:
 		cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
 	done
 
-	@@echo ${JQ} "built."
+	@@echo ${JQ} "Built"
 	@@echo
 
 lite: ${JQ_LITE}
@@ -35,8 +37,8 @@ lite: ${JQ_LITE}
 ${JQ_LITE}: jquery
 	@@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}
@@ -44,11 +46,24 @@ pack: ${JQ_PACK}
 ${JQ_PACK}: jquery
 	@@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 " - Copying over script files."
+	@@cp -R ${BUILD_DIR}/test/js ${TEST_DIR}/js
+
+	@@echo " - Compiling Test Cases"
+	@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
+
+	@@echo "Test Suite Built"
+	@@echo
 
 docs: ${JQ}
 	@@echo "Building Documentation"
@@ -64,11 +79,17 @@ docs: ${JQ}
 	@@cp -R ${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}