X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=a906d0bf80ce848519ffdb2fe429419142088b93;hb=766c3765bd30e6a643eff99da0f1c293aa2897bd;hp=de1821961a685eda7fb91cdd03e8b67a7416d4f9;hpb=f01c002f2620473aa32a5d07a51b5ffb43d573f7;p=jquery.git

diff --git a/Makefile b/Makefile
index de18219..a906d0b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,113 @@
 SRC_DIR = src
 BUILD_DIR = build
-DOCS_DIR = docs
 
-MODULES = jquery event fx ajax
-JQ = jquery-svn.js
-JQ_PACK = jquery-svn.pack.js
+PREFIX = .
+DOCS_DIR = ${PREFIX}/docs
+TEST_DIR = ${PREFIX}/test
+DIST_DIR = ${PREFIX}/dist
 
-all: ${JQ} ${JQ_PACK} docs
+MODULES = ${SRC_DIR}/intro.js\
+	${SRC_DIR}/jquery/*\
+	${SRC_DIR}/event/*\
+	${SRC_DIR}/fx/*\
+	${SRC_DIR}/ajax/*\
+	${SRC_DIR}/outro.js
 
-${JQ}: 
-	@@echo "Building jquery-svn.js";
+JQ = ${DIST_DIR}/jquery.js
+JQ_LITE = ${DIST_DIR}/jquery.lite.js
+JQ_PACK = ${DIST_DIR}/jquery.pack.js
 
-	@@for f in ${MODULES}; do \
-		echo "Adding module:" $$f;\
-		cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
-	done
+JQ_VER = `cat version.txt`
+VER = sed s/@VERSION/${JQ_VER}/
 
-	@@echo "jquery-svn.js built.";
+JAR = java -jar ${BUILD_DIR}/js.jar
+
+all: jquery lite pack docs test
+	@@echo "jQuery build complete."
+
+${DIST_DIR}:
+	@@mkdir -p ${DIST_DIR}
+
+jquery: ${DIST_DIR} ${JQ}
+
+${JQ}: ${MODULES}
+	@@echo "Building" ${JQ}
+
+	@@mkdir -p ${DIST_DIR}
+	@@cat ${MODULES} | ${VER} > ${JQ};
+
+	@@echo ${JQ} "Built"
+	@@echo
+
+lite: ${JQ_LITE}
+
+${JQ_LITE}: ${JQ}
+	@@echo "Building" ${JQ_LITE}
+
+	@@echo " - Removing ScriptDoc from" ${JQ}
+	@@${JAR} ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
+
+	@@echo ${JQ_LITE} "Built"
+	@@echo
+
+pack: ${JQ_PACK}
 
 ${JQ_PACK}: ${JQ}
-	@@echo "Building jquery-svn.pack.js";
+	@@echo "Building" ${JQ_PACK}
+
+	@@echo " - Compressing using Packer"
+	@@${JAR} ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
 
-	cd ${BUILD_DIR} && java -jar js.jar build.js ../${JQ} ../${JQ_PACK}
+	@@echo ${JQ_PACK} "Built"
+	@@echo
 
-	@@echo "jquery-svn.pack.js built.";
+test: ${JQ}
+	@@echo "Building Test Suite"
 
-test:
+	@@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/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}
+
+	@@echo "Test Suite Built"
+	@@echo
 
 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 htaccess file."
+	@@cp -fR ${BUILD_DIR}/docs/.htaccess ${DOCS_DIR}
+
+	@@echo " - Copying over script files."
+	@@cp -fR ${BUILD_DIR}/docs/js ${DOCS_DIR}/js
+
+	@@echo " - Copying over style files."
+	@@cp -fR ${BUILD_DIR}/docs/style ${DOCS_DIR}/style
+
+	@@echo " - Extracting ScriptDoc from" ${JQ}
+	@@${JAR} ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
+
+	@@echo "Documentation Built"
+	@@echo
 
 clean:
-	rm ${JQ}
+	@@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}