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

diff --git a/Makefile b/Makefile
index ff69488..2ab385b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,98 +2,67 @@ SRC_DIR = src
 BUILD_DIR = build
 
 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\
-	${BASE_FILES}\
-	${SRC_DIR}/outro.js
+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_WITH_PLUGINS = ${SRC_DIR}/intro.js\
+MODULES = ${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
+MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
+
+DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'`
 
-all: jquery lite min pack docs test speed
+all: jquery min
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
 	@@mkdir -p ${DIST_DIR}
 
-jquery: ${DIST_DIR} ${JQ}
+init:
+	@@echo "Grabbing external dependencies..."
+	@@git submodule init
+	@@git submodule update
+	@@cd src/sizzle && git pull
+	@@cd test/qunit && git pull
+	@@git submodule update
+
+jquery: ${DIST_DIR} selector ${JQ}
 
 ${JQ}: ${MODULES}
 	@@echo "Building" ${JQ}
 
 	@@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};
+	@@cat ${MODULES} | \
+		sed 's/Date:./&'"${DATE}"'/' | \
+		${VER} > ${JQ};
 
 	@@echo ${JQ} "Built"
 	@@echo
 
-lite: ${JQ_LITE}
-
-${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}: ${JQ}
-	@@echo "Building" ${JQ_PACK}
-
-	@@echo " - Compressing using Packer"
-	@@${JAR} ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
-
-	@@echo ${JQ_PACK} "Built"
-	@@echo
+selector: init
+	@@echo "Building selector code from Sizzle"
+	@@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js > src/selector.js
 
 min: ${JQ_MIN}
 
@@ -101,78 +70,14 @@ ${JQ_MIN}: ${JQ}
 	@@echo "Building" ${JQ_MIN}
 
 	@@echo " - Compressing using Minifier"
-	@@${JAR} ${BUILD_DIR}/build/min.js ${JQ} ${JQ_MIN}
+	@@${MINJAR} ${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}
-
-	@@echo " - Removing any old tests"
-	@@rm -f ${TEST_DIR}/tests/*
-
-	@@echo " - Copying over script files."
-	@@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}
-
-	@@echo "Test Suite Built"
-	@@echo
-
-docs: ${JQ}
-	@@echo "Building Documentation"
-
-	@@echo " - Making Documentation Directory:" ${DOCS_DIR}
-	@@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
-
-	@@echo " - Copying over style files."
-	@@cp -fR ${BUILD_DIR}/docs/style ${DOCS_DIR}/style
-
-	@@echo " - Extracting ScriptDoc from" ${JQ}
-	@@${JAR} ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
-
-	@@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}
 
-	@@echo "Removing Test Suite directory:" ${TEST_DIR}
-	@@rm -rf ${TEST_DIR}
-
-	@@echo "Removing Documentation directory:" ${DOCS_DIR}
-	@@rm -rf ${DOCS_DIR}
-
-	@@echo "Removing Speed Test Suite directory:" ${SPEED_DIR}
-	@@rm -rf ${SPEED_DIR}
+	@@echo "Removing built copy of Sizzle"
+	@@rm src/selector.js