X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=2d344c6a58375a790bdce1bc9a12b3fb3c0f3882;hb=434b87b8a233eb24ec773de801f3adb460fbd0f4;hp=e9a977c19abbeab4b48fa8de7498dbd7a0c25794;hpb=b4e23b5af0820a66c2e275051f613f3df9a4444d;p=jquery.git

diff --git a/Makefile b/Makefile
index e9a977c..2d344c6 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,14 @@ SPEED_DIR = ${PREFIX}/speed
 PLUG_DIR = ../plugins
 
 BASE_FILES = ${SRC_DIR}/core.js\
+	${SRC_DIR}/data.js\
+	${SRC_DIR}/support.js\
 	${SRC_DIR}/selector.js\
 	${SRC_DIR}/event.js\
 	${SRC_DIR}/ajax.js\
-	${SRC_DIR}/fx.js
+	${SRC_DIR}/fx.js\
+	${SRC_DIR}/offset.js\
+	${SRC_DIR}/dimensions.js
 
 PLUGINS = ${PLUG_DIR}/button/*\
 	${PLUG_DIR}/center/*\
@@ -46,6 +50,7 @@ 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 min pack speed
 	@@echo "jQuery build complete."
@@ -78,8 +83,7 @@ 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
@@ -101,27 +105,13 @@ ${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}
-
-	@@echo " - Compiling Test Cases"
-	#@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
-
 	@@echo "Test Suite Built"
 	@@echo
 
@@ -164,7 +154,7 @@ speed: ${JQ}
 	@@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}
+	@@cp -f ${BUILD_DIR}/speed/jquery-basis.js ${SPEED_DIR}
 
 	@@echo "Speed Test Suite Built"
 	@@echo
@@ -173,9 +163,6 @@ 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}