X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=0a65e8a9191f5497485be6788d34b49d6af5ce71;hb=9bdfc671fc19486f9cc1ca306bec2acd80ad77fc;hp=de1821961a685eda7fb91cdd03e8b67a7416d4f9;hpb=f01c002f2620473aa32a5d07a51b5ffb43d573f7;p=jquery.git

diff --git a/Makefile b/Makefile
index de18219..0a65e8a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,74 @@
 SRC_DIR = src
 BUILD_DIR = build
-DOCS_DIR = docs
+
+PREFIX = .
+DOCS_DIR = ${PREFIX}/docs
+TEST_DIR = ${PREFIX}/test
+DIST_DIR = ${PREFIX}/dist
 
 MODULES = jquery event fx ajax
-JQ = jquery-svn.js
-JQ_PACK = jquery-svn.pack.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
+	@@echo "jQuery build complete."
+
+${DIST_DIR}:
+	@@mkdir -p ${DIST_DIR}
 
-all: ${JQ} ${JQ_PACK} docs
+jquery: ${DIST_DIR} ${JQ}
 
-${JQ}: 
-	@@echo "Building jquery-svn.js";
+${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 "jquery-svn.js built.";
+	@@echo ${JQ} "built."
+	@@echo
 
-${JQ_PACK}: ${JQ}
-	@@echo "Building jquery-svn.pack.js";
+lite: ${JQ_LITE}
 
-	cd ${BUILD_DIR} && java -jar js.jar build.js ../${JQ} ../${JQ_PACK}
+${JQ_LITE}: jquery
+	@@echo "Building" ${JQ_LITE}
+	@@echo " - Removing ScriptDoc from" ${JQ}
+	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
+	@@echo ${JQ_LITE} "built."
+	@@echo
 
-	@@echo "jquery-svn.pack.js built.";
+pack: ${JQ_PACK}
 
-test:
+${JQ_PACK}: jquery
+	@@echo "Building" ${JQ_PACK}
+	@@echo " - Compressing using Packer"
+	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
+	@@echo ${JQ_PACK} "built."
+	@@echo
+
+test: ${JQ}
 
 docs: ${JQ}
-	@@echo "Building Documentation";
-	cd ${BUILD_DIR} && java -jar js.jar 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/docs.js ${JQ} ${DOCS_DIR}
+
+	@@echo "Documentation built."
+	@@echo
 
 clean:
-	rm ${JQ}
+	@@rm -rf ${DIST_DIR}
+	@@rm -rf ${DOCS_DIR}