X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=Makefile;h=ff69488486833e3cb8c2ec004c3dcafbcf33e599;hp=a22670ea78a1a99ff26a3acf6db818f0cea17700;hb=21d59e8de607e33c54cf8f7bff2c5f0b7a6c40f9;hpb=6ebf2f979c5efe6b234821f5e3b93c59da7f0aa3

diff --git a/Makefile b/Makefile
index a22670e..ff69488 100644
--- a/Makefile
+++ b/Makefile
@@ -5,21 +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}/jquery/jquery.js\
+	${SRC_DIR}/selector/selector.js\
+	${SRC_DIR}/event/event.js\
+	${SRC_DIR}/ajax/ajax.js\
+	${SRC_DIR}/fx/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\
-	${SRC_DIR}/jquery/*\
-	${SRC_DIR}/event/*\
-	${SRC_DIR}/fx/*\
-	${SRC_DIR}/ajax/*
-	${SRC_DIR}/outro.js\
+	${BASE_FILES}\
+	${SRC_DIR}/outro.js
+
+MODULES_WITH_PLUGINS = ${SRC_DIR}/intro.js\
+	${BASE_FILES}\
+	${PLUGINS}\
+	${SRC_DIR}/outro.js
 
 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 test
+all: jquery lite min pack docs test speed
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
@@ -31,7 +59,16 @@ ${JQ}: ${MODULES}
 	@@echo "Building" ${JQ}
 
 	@@mkdir -p ${DIST_DIR}
-	@@cat ${MODULES} > ${JQ};
+	@@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
@@ -58,6 +95,17 @@ ${JQ_PACK}: ${JQ}
 	@@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"
 
@@ -68,8 +116,10 @@ test: ${JQ}
 	@@rm -f ${TEST_DIR}/tests/*
 
 	@@echo " - Copying over script files."
-	@@cp -fR ${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}
+	@@cp -f ${BUILD_DIR}/test/fx.html ${TEST_DIR}
+	@@cp -f ${BUILD_DIR}/test/cow.jpg ${TEST_DIR}
 
 	@@echo " - Compiling Test Cases"
 	@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
@@ -84,6 +134,9 @@ 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 -fR ${BUILD_DIR}/docs/js ${DOCS_DIR}/js
 
@@ -96,6 +149,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}
@@ -105,3 +173,6 @@ clean:
 
 	@@echo "Removing Documentation directory:" ${DOCS_DIR}
 	@@rm -rf ${DOCS_DIR}
+
+	@@echo "Removing Speed Test Suite directory:" ${SPEED_DIR}
+	@@rm -rf ${SPEED_DIR}