fix sed statement used to extract the date

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index f0be47f..0d54c96 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,18 +2,38 @@ 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
 
-JAR = java -jar ${BUILD_DIR}/js.jar
+DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'`
 
-all: jquery lite pack docs
+all: jquery test min
        @@echo "jQuery build complete."
 
 ${DIST_DIR}:
@@ -21,75 +41,35 @@ ${DIST_DIR}:
 
 jquery: ${DIST_DIR} ${JQ}
 
-${JQ}:
+${JQ}: ${MODULES}
        @@echo "Building" ${JQ}
 
-       @@for f in ${MODULES}; do \
-               echo " - Adding module:" $$f;\
-               cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
-       done
+       @@mkdir -p ${DIST_DIR}
+       @@cat ${MODULES} | \
+               sed 's/Date:./&'"${DATE}"'/' | \
+               ${VER} > ${JQ};
 
        @@echo ${JQ} "Built"
        @@echo
 
-lite: ${JQ_LITE}
+min: ${JQ_MIN}
 
-${JQ_LITE}: jquery
-       @@echo "Building" ${JQ_LITE}
-       @@echo " - Removing ScriptDoc from" ${JQ}
-       @@${JAR} ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
-       @@echo ${JQ_LITE} "Built"
-       @@echo
+${JQ_MIN}: ${JQ}
+       @@echo "Building" ${JQ_MIN}
 
-pack: ${JQ_PACK}
+       @@echo " - Compressing using Minifier"
+       @@${MINJAR} ${JQ} > ${JQ_MIN}
 
-${JQ_PACK}: jquery
-       @@echo "Building" ${JQ_PACK}
-       @@echo " - Compressing using Packer"
-       @@${JAR} ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
-       @@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 " - Copying over script files."
-       @@cp -R ${BUILD_DIR}/test/js ${TEST_DIR}/js
-
-       @@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 script files."
-       @@cp -R ${BUILD_DIR}/docs/js ${DOCS_DIR}/js
-
-       @@echo " - Copying over style files."
-       @@cp -R ${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
+       git submodule init
+       git submodule update
 
 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}