git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for #263.
[jquery.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
4f75386
..
a906d0b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-6,15
+6,20
@@
DOCS_DIR = ${PREFIX}/docs
TEST_DIR = ${PREFIX}/test
DIST_DIR = ${PREFIX}/dist
TEST_DIR = ${PREFIX}/test
DIST_DIR = ${PREFIX}/dist
-MODULES = ${SRC_DIR}/jquery/*\
+MODULES = ${SRC_DIR}/intro.js\
+ ${SRC_DIR}/jquery/*\
${SRC_DIR}/event/*\
${SRC_DIR}/fx/*\
${SRC_DIR}/event/*\
${SRC_DIR}/fx/*\
- ${SRC_DIR}/ajax/*
+ ${SRC_DIR}/ajax/*\
+ ${SRC_DIR}/outro.js
JQ = ${DIST_DIR}/jquery.js
JQ_LITE = ${DIST_DIR}/jquery.lite.js
JQ_PACK = ${DIST_DIR}/jquery.pack.js
JQ = ${DIST_DIR}/jquery.js
JQ_LITE = ${DIST_DIR}/jquery.lite.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
all: jquery lite pack docs test
JAR = java -jar ${BUILD_DIR}/js.jar
all: jquery lite pack docs test
@@
-29,7
+34,7
@@
${JQ}: ${MODULES}
@@echo "Building" ${JQ}
@@mkdir -p ${DIST_DIR}
@@echo "Building" ${JQ}
@@mkdir -p ${DIST_DIR}
- @@cat ${MODULES} > ${JQ};
+ @@cat ${MODULES} | ${VER} > ${JQ};
@@echo ${JQ} "Built"
@@echo
@@echo ${JQ} "Built"
@@echo
@@
-61,13
+66,13
@@
test: ${JQ}
@@echo " - Making Test Suite Directory:" ${TEST_DIR}
@@mkdir -p ${TEST_DIR}
@@echo " - Making Test Suite Directory:" ${TEST_DIR}
@@mkdir -p ${TEST_DIR}
- @@mkdir -p ${TEST_DIR}/tests/
@@echo " - Removing any old tests"
@@rm -f ${TEST_DIR}/tests/*
@@echo " - Copying over script files."
@@echo " - Removing any old tests"
@@rm -f ${TEST_DIR}/tests/*
@@echo " - Copying over script files."
- @@cp -fR ${BUILD_DIR}/test/js ${TEST_DIR}/js
+ @@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 " - Compiling Test Cases"
@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
@@
-82,6
+87,9
@@
docs: ${JQ}
@@mkdir -p ${DOCS_DIR}
@@mkdir -p ${DOCS_DIR}/data
@@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 script files."
@@cp -fR ${BUILD_DIR}/docs/js ${DOCS_DIR}/js