X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=2ab385bee127362c5b95d80d521e1d88581193e8;hb=a8b089a02089d3d7b7e0744e59618ff9800e760a;hp=0a65e8a9191f5497485be6788d34b49d6af5ce71;hpb=9bdfc671fc19486f9cc1ca306bec2acd80ad77fc;p=jquery.git

diff --git a/Makefile b/Makefile
index 0a65e8a..2ab385b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,73 +2,82 @@ SRC_DIR = src
 BUILD_DIR = build
 
 PREFIX = .
-DOCS_DIR = ${PREFIX}/docs
-TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
 
-MODULES = jquery event fx ajax
+BASE_FILES = ${SRC_DIR}/core.js\
+	${SRC_DIR}/data.js\
+	${SRC_DIR}/event.js\
+	${SRC_DIR}/support.js\
+	${SRC_DIR}/selector.js\
+	${SRC_DIR}/traversing.js\
+	${SRC_DIR}/attributes.js\
+	${SRC_DIR}/manipulation.js\
+	${SRC_DIR}/css.js\
+	${SRC_DIR}/ajax.js\
+	${SRC_DIR}/fx.js\
+	${SRC_DIR}/offset.js\
+	${SRC_DIR}/dimensions.js
+
+MODULES = ${SRC_DIR}/intro.js\
+	${BASE_FILES}\
+	${SRC_DIR}/outro.js
+
 JQ = ${DIST_DIR}/jquery.js
-JQ_LITE = ${DIST_DIR}/jquery.lite.js
-JQ_PACK = ${DIST_DIR}/jquery.pack.js
+JQ_MIN = ${DIST_DIR}/jquery.min.js
+
+JQ_VER = `cat version.txt`
+VER = sed s/@VERSION/${JQ_VER}/
+
+MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
+
+DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'`
 
-all: jquery lite pack docs
+all: jquery min
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
 	@@mkdir -p ${DIST_DIR}
 
-jquery: ${DIST_DIR} ${JQ}
-
-${JQ}:
-	@@echo "Building" ${JQ}
-
-	@@for f in ${MODULES}; do \
-		echo " - Adding module:" $$f;\
-		cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
-	done
+init:
+	@@echo "Grabbing external dependencies..."
+	@@git submodule init
+	@@git submodule update
+	@@cd src/sizzle && git pull
+	@@cd test/qunit && git pull
+	@@git submodule update
 
-	@@echo ${JQ} "built."
-	@@echo
+jquery: ${DIST_DIR} selector ${JQ}
 
-lite: ${JQ_LITE}
+${JQ}: ${MODULES}
+	@@echo "Building" ${JQ}
 
-${JQ_LITE}: jquery
-	@@echo "Building" ${JQ_LITE}
-	@@echo " - Removing ScriptDoc from" ${JQ}
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
-	@@echo ${JQ_LITE} "built."
-	@@echo
+	@@mkdir -p ${DIST_DIR}
 
-pack: ${JQ_PACK}
+	@@cat ${MODULES} | \
+		sed 's/Date:./&'"${DATE}"'/' | \
+		${VER} > ${JQ};
 
-${JQ_PACK}: jquery
-	@@echo "Building" ${JQ_PACK}
-	@@echo " - Compressing using Packer"
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
-	@@echo ${JQ_PACK} "built."
+	@@echo ${JQ} "Built"
 	@@echo
 
-test: ${JQ}
+selector: init
+	@@echo "Building selector code from Sizzle"
+	@@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js > src/selector.js
 
-docs: ${JQ}
-	@@echo "Building Documentation"
+min: ${JQ_MIN}
 
-	@@echo " - Making Documentation Directory:" ${DOCS_DIR}
-	@@mkdir -p ${DOCS_DIR}
-	@@mkdir -p ${DOCS_DIR}/data
+${JQ_MIN}: ${JQ}
+	@@echo "Building" ${JQ_MIN}
 
-	@@echo " - Copying over script files."
-	@@cp -R ${BUILD_DIR}/docs/js ${DOCS_DIR}/js
+	@@echo " - Compressing using Minifier"
+	@@${MINJAR} ${JQ} > ${JQ_MIN}
 
-	@@echo " - Copying over style files."
-	@@cp -R ${BUILD_DIR}/docs/style ${DOCS_DIR}/style
-
-	@@echo " - Extracting ScriptDoc from" ${JQ}
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
-
-	@@echo "Documentation built."
+	@@echo ${JQ_MIN} "Built"
 	@@echo
 
 clean:
+	@@echo "Removing Distribution directory:" ${DIST_DIR}
 	@@rm -rf ${DIST_DIR}
-	@@rm -rf ${DOCS_DIR}
+
+	@@echo "Removing built copy of Sizzle"
+	@@rm src/selector.js