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

diff --git a/Makefile b/Makefile
index f949811..5b2cae8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
 SRC_DIR = src
 BUILD_DIR = build
 
-DOCS_DIR = docs
-DIST_DIR = dist
+PREFIX = .
+DOCS_DIR = ${PREFIX}/docs
+TEST_DIR = ${PREFIX}/test
+DIST_DIR = ${PREFIX}/dist
 
 MODULES = jquery event fx ajax
 JQ = ${DIST_DIR}/jquery.js
@@ -10,44 +12,63 @@ JQ_LITE = ${DIST_DIR}/jquery.lite.js
 JQ_PACK = ${DIST_DIR}/jquery.pack.js
 
 all: jquery lite pack docs
+	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
-	mkdir -p ${DIST_DIR}
+	@@mkdir -p ${DIST_DIR}
 
 jquery: ${DIST_DIR} ${JQ}
 
 ${JQ}:
-	@@echo "Building" ${JQ};
+	@@echo "Building" ${JQ}
 
 	@@for f in ${MODULES}; do \
-		echo "Adding module:" $$f;\
+		echo " - Adding module:" $$f;\
 		cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
 	done
 
-	@@echo ${JQ} "built.";
+	@@echo ${JQ} "built."
+	@@echo
 
 lite: ${JQ_LITE}
 
-${JQ_LITE}: ${JQ}
-	@@echo "Building" ${JQ_LITE};
-	java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/lite.js ${JQ} ${JQ_LITE}
-	@@echo ${JQ_LITE} "built.";
+${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."
+	@@echo
 
 pack: ${JQ_PACK}
 
-${JQ_PACK}: ${JQ}
-	@@echo "Building" ${JQ_PACK};
-	java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build.js ${JQ} ${JQ_PACK}
-	@@echo ${JQ_PACK} "built.";
+${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."
+	@@echo
 
-test:
+test: ${JQ}
 
 docs: ${JQ}
-	@@echo "Building Documentation";
-	java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/docs.js ${JQ} ${DOCS_DIR}
-	@@echo "Documentation built.";
+	@@echo "Building Documentation"
+
+	@@echo " - Making Documentation Directory:" ${DOCS_DIR}
+	@@mkdir -p ${DOCS_DIR}
+	@@mkdir -p ${DOCS_DIR}/data
+
+	@@echo " - Copying over script files."
+	@@cp -R ${BUILD_DIR}/docs/js ${DOCS_DIR}/js
+
+	@@echo " - Copying over style files."
+	@@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}
+
+	@@echo "Documentation built."
+	@@echo
 
 clean:
-	rm -rf ${DIST_DIR}
-	rm -f ${DOCS_DIR}/index.xml
-	rm -f ${DOCS_DIR}/data/*
+	@@rm -rf ${DIST_DIR}
+	@@rm -rf ${DOCS_DIR}