X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=baa06c404bd94f1a2cfe1d7b62c66bc0039d617c;hb=3980dc92955a62bdfeb9f3b0572bfe64155a125d;hp=e11ea5d2781f8a9c96973b509ddb62b4b79f2a1c;hpb=87284a8ee751e1b4bb4a1ed96cdb92cb938d5f04;p=jquery.git

diff --git a/Makefile b/Makefile
index e11ea5d..baa06c4 100644
--- a/Makefile
+++ b/Makefile
@@ -5,18 +5,39 @@ PREFIX = .
 DOCS_DIR = ${PREFIX}/docs
 TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
+PLUG_DIR = ../plugins
 
-MODULES = ${SRC_DIR}/intro.js\
-	${SRC_DIR}/jquery/*\
+BASE_FILES = ${SRC_DIR}/jquery/*\
 	${SRC_DIR}/event/*\
 	${SRC_DIR}/fx/*\
-	${SRC_DIR}/ajax/*\
+	${SRC_DIR}/ajax/*
+
+PLUGINS = ${PLUG_DIR}/button/*\
+	${PLUG_DIR}/center/*\
+	${PLUG_DIR}/cookie/*\
+	${PLUG_DIR}/form/*\
+	${PLUG_DIR}/greybox/greybox.js\
+	${PLUG_DIR}/interface/*\
+	${PLUG_DIR}/pager/*\
+	${PLUG_DIR}/tablesorter/*\
+	${PLUG_DIR}/tabs/*
+
+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
 
 JQ = ${DIST_DIR}/jquery.js
 JQ_LITE = ${DIST_DIR}/jquery.lite.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 +52,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
@@ -68,7 +98,7 @@ 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}
 
 	@@echo " - Compiling Test Cases"
@@ -84,6 +114,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