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

diff --git a/Makefile b/Makefile
index f0be47f..e9a977c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,15 +5,49 @@ PREFIX = .
 DOCS_DIR = ${PREFIX}/docs
 TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
+SPEED_DIR = ${PREFIX}/speed
+PLUG_DIR = ../plugins
+
+BASE_FILES = ${SRC_DIR}/core.js\
+	${SRC_DIR}/selector.js\
+	${SRC_DIR}/event.js\
+	${SRC_DIR}/ajax.js\
+	${SRC_DIR}/fx.js
+
+PLUGINS = ${PLUG_DIR}/button/*\
+	${PLUG_DIR}/center/*\
+	${PLUG_DIR}/cookie/*\
+	${PLUG_DIR}/dimensions/*\
+	${PLUG_DIR}/metadata/*\
+	${PLUG_DIR}/form/*\
+	${PLUG_DIR}/greybox/greybox.js\
+	${PLUG_DIR}/interface/*\
+	${PLUG_DIR}/pager/*\
+	${PLUG_DIR}/tablesorter/*\
+	${PLUG_DIR}/tabs/*\
+	${PLUG_DIR}/tooltip/jquery.tooltip.js\
+	${PLUG_DIR}/accordion/jquery.accordion.js
+
+MODULES = ${SRC_DIR}/intro.js\
+	${BASE_FILES}\
+	${SRC_DIR}/outro.js
+
+MODULES_WITH_PLUGINS = ${SRC_DIR}/intro.js\
+	${BASE_FILES}\
+	${PLUGINS}\
+	${SRC_DIR}/outro.js
 
-MODULES = jquery event fx ajax
 JQ = ${DIST_DIR}/jquery.js
 JQ_LITE = ${DIST_DIR}/jquery.lite.js
+JQ_MIN = ${DIST_DIR}/jquery.min.js
 JQ_PACK = ${DIST_DIR}/jquery.pack.js
 
+JQ_VER = `cat version.txt`
+VER = sed s/@VERSION/${JQ_VER}/
+
 JAR = java -jar ${BUILD_DIR}/js.jar
 
-all: jquery lite pack docs
+all: jquery lite min pack speed
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
@@ -21,50 +55,83 @@ ${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} | ${VER} > ${JQ};
+
+	@@echo ${JQ} "Built"
+	@@echo
+
+with_plugins: ${MODULES_WITH_PLUGINS}
+	@@echo "Building" ${JQ}
+
+	@@mkdir -p ${DIST_DIR}
+	@@cat ${MODULES_WITH_PLUGINS} | ${VER} > ${JQ};
 
 	@@echo ${JQ} "Built"
 	@@echo
 
 lite: ${JQ_LITE}
 
-${JQ_LITE}: jquery
+${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}: jquery
+${JQ_PACK}: ${JQ}
 	@@echo "Building" ${JQ_PACK}
+
 	@@echo " - Compressing using Packer"
 	@@${JAR} ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
+
 	@@echo ${JQ_PACK} "Built"
 	@@echo
 
+min: ${JQ_MIN}
+
+${JQ_MIN}: ${JQ}
+	@@echo "Building" ${JQ_MIN}
+
+	@@echo " - Compressing using Minifier"
+	@@${JAR} ${BUILD_DIR}/build/min.js ${JQ} ${JQ_MIN}
+
+	@@echo ${JQ_MIN} "Built"
+	@@echo
+
 test: ${JQ}
 	@@echo "Building Test Suite"
 
 	@@echo " - Making Test Suite Directory:" ${TEST_DIR}
-	@@mkdir -p ${TEST_DIR}
+	#@@mkdir -p ${TEST_DIR}
+
+	@@echo " - Removing any old tests"
+	#@@rm -f ${TEST_DIR}/tests/*
 
 	@@echo " - Copying over script files."
-	@@cp -R ${BUILD_DIR}/test/js ${TEST_DIR}/js
+	#@@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}
+	#@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
 
 	@@echo "Test Suite Built"
 	@@echo
 
+runtest: ${JQ} test
+	@@echo "Running Automated Test Suite"
+	@@${JAR} ${BUILD_DIR}/runtest/test.js
+
+	@@echo "Test Suite Finished"
+	@@echo
+
 docs: ${JQ}
 	@@echo "Building Documentation"
 
@@ -72,11 +139,14 @@ docs: ${JQ}
 	@@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 -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}
 	@@${JAR} ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
@@ -84,6 +154,21 @@ docs: ${JQ}
 	@@echo "Documentation Built"
 	@@echo
 
+speed: ${JQ}
+	@@echo "Building Speed Test Suite"
+
+	@@echo " - Making Speed Test Suite Directory:" ${SPEED_DIR}
+	@@mkdir -p ${SPEED_DIR}
+
+	@@echo " - Copying over script files."
+	@@cp -f ${BUILD_DIR}/speed/index.html ${SPEED_DIR}
+	@@cp -f ${BUILD_DIR}/speed/benchmarker.css ${SPEED_DIR}
+	@@cp -f ${BUILD_DIR}/speed/benchmarker.js ${SPEED_DIR}
+	@@cp -f ${BUILD_DIR}/speed/jquery-1.1.2.js ${SPEED_DIR}
+
+	@@echo "Speed Test Suite Built"
+	@@echo
+
 clean:
 	@@echo "Removing Distribution directory:" ${DIST_DIR}
 	@@rm -rf ${DIST_DIR}
@@ -93,3 +178,6 @@ clean:
 
 	@@echo "Removing Documentation directory:" ${DOCS_DIR}
 	@@rm -rf ${DOCS_DIR}
+
+	@@echo "Removing Speed Test Suite directory:" ${SPEED_DIR}
+	@@rm -rf ${SPEED_DIR}