X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=439f42d349be53309edb6f45886d6ed36b59f671;hb=cd05cac37f8e63608496788fc7afa5400c18752e;hp=a906d0bf80ce848519ffdb2fe429419142088b93;hpb=766c3765bd30e6a643eff99da0f1c293aa2897bd;p=jquery.git

diff --git a/Makefile b/Makefile
index a906d0b..439f42d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,24 +5,39 @@ PREFIX = .
 DOCS_DIR = ${PREFIX}/docs
 TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
+SPEED_DIR = ${PREFIX}/speed
+
+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\
-	${SRC_DIR}/jquery/*\
-	${SRC_DIR}/event/*\
-	${SRC_DIR}/fx/*\
-	${SRC_DIR}/ajax/*\
+	${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}/
 
-JAR = java -jar ${BUILD_DIR}/js.jar
+MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
 
-all: jquery lite pack docs test
+DATE=`svn info . | grep Date: | sed 's/.*: //g'`
+REV=`svn info . | grep Rev: | sed 's/.*: //g'`
+
+all: jquery test min speed
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
@@ -34,7 +49,10 @@ ${JQ}: ${MODULES}
 	@@echo "Building" ${JQ}
 
 	@@mkdir -p ${DIST_DIR}
-	@@cat ${MODULES} | ${VER} > ${JQ};
+	@@cat ${MODULES} | \
+		sed 's/Date:./&'"${DATE}"'/' | \
+		sed 's/Revision:./&'"${REV}"'/' | \
+		${VER} > ${JQ};
 
 	@@echo ${JQ} "Built"
 	@@echo
@@ -44,70 +62,50 @@ lite: ${JQ_LITE}
 ${JQ_LITE}: ${JQ}
 	@@echo "Building" ${JQ_LITE}
 
-	@@echo " - Removing ScriptDoc from" ${JQ}
-	@@${JAR} ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
+	@@cp ${JQ} ${JQ_LITE}
 
 	@@echo ${JQ_LITE} "Built"
 	@@echo
 
-pack: ${JQ_PACK}
+min: ${JQ_MIN}
 
-${JQ_PACK}: ${JQ}
-	@@echo "Building" ${JQ_PACK}
+${JQ_MIN}: ${JQ}
+	@@echo "Building" ${JQ_MIN}
 
-	@@echo " - Compressing using Packer"
-	@@${JAR} ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
+	@@echo " - Compressing using Minifier"
+	@@${MINJAR} ${JQ} > ${JQ_MIN}
 
-	@@echo ${JQ_PACK} "Built"
+	@@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}
-
-	@@echo " - Compiling Test Cases"
-	@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
-
 	@@echo "Test Suite Built"
 	@@echo
+	git submodule init
+	git submodule update
 
-docs: ${JQ}
-	@@echo "Building Documentation"
-
-	@@echo " - Making Documentation Directory:" ${DOCS_DIR}
-	@@mkdir -p ${DOCS_DIR}
-	@@mkdir -p ${DOCS_DIR}/data
+speed: ${JQ}
+	@@echo "Building Speed Test Suite"
 
-	@@echo " - Copying over htaccess file."
-	@@cp -fR ${BUILD_DIR}/docs/.htaccess ${DOCS_DIR}
+	@@echo " - Making Speed Test Suite Directory:" ${SPEED_DIR}
+	@@mkdir -p ${SPEED_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
+	@@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-basis.js ${SPEED_DIR}
 
-	@@echo " - Extracting ScriptDoc from" ${JQ}
-	@@${JAR} ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
-
-	@@echo "Documentation Built"
+	@@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}