X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=4ec8ad6286b8551b0f2947c222924bcadfa1588a;hb=297a450e05e80e930d53631bb9ae2c3fe09378b7;hp=72b3b041db5ebccef6fddf8ffc0810abaf776cba;hpb=f6ecc6a95c4046f53d1f0d75af213305c2bd7ea7;p=jquery.git

diff --git a/Makefile b/Makefile
index 72b3b04..4ec8ad6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,18 +5,45 @@ PREFIX = .
 DOCS_DIR = ${PREFIX}/docs
 TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
+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
@@ -31,7 +58,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,19 +94,31 @@ ${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"
 
 	@@echo " - Making Test Suite Directory:" ${TEST_DIR}
 	@@mkdir -p ${TEST_DIR}
-	@@mkdir -p ${TEST_DIR}/tests/
 
 	@@echo " - Removing any old tests"
 	@@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}
@@ -85,6 +133,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