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 bug #983 (Packed jQuery doesn't have a license at the top of the file.)
[jquery.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
9fcdd80
..
4ec8ad6
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-8,9
+8,10
@@
DIST_DIR = ${PREFIX}/dist
PLUG_DIR = ../plugins
BASE_FILES = ${SRC_DIR}/jquery/jquery.js\
PLUG_DIR = ../plugins
BASE_FILES = ${SRC_DIR}/jquery/jquery.js\
+ ${SRC_DIR}/selector/selector.js\
${SRC_DIR}/event/event.js\
${SRC_DIR}/event/event.js\
- ${SRC_DIR}/fx/fx.js\
- ${SRC_DIR}/ajax/ajax.js
+ ${SRC_DIR}/ajax/ajax.js\
+ ${SRC_DIR}/fx/fx.js
PLUGINS = ${PLUG_DIR}/button/*\
${PLUG_DIR}/center/*\
PLUGINS = ${PLUG_DIR}/button/*\
${PLUG_DIR}/center/*\
@@
-37,6
+38,7
@@
MODULES_WITH_PLUGINS = ${SRC_DIR}/intro.js\
JQ = ${DIST_DIR}/jquery.js
JQ_LITE = ${DIST_DIR}/jquery.lite.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`
JQ_PACK = ${DIST_DIR}/jquery.pack.js
JQ_VER = `cat version.txt`
@@
-92,6
+94,17
@@
${JQ_PACK}: ${JQ}
@@echo ${JQ_PACK} "Built"
@@echo
@@echo ${JQ_PACK} "Built"
@@echo
+min: ${JQ_MIN}
+
+${JQ_MIN}: ${JQ}
+ @@echo "Building" ${JQ_MIN}
+
+ @@echo " - Compressing using Minifier"
+ @@${JAR} ${BUILD_DIR}/build/min.js ${JQ} ${JQ_MIN}
+
+ @@echo ${JQ_MIN} "Built"
+ @@echo
+
test: ${JQ}
@@echo "Building Test Suite"
test: ${JQ}
@@echo "Building Test Suite"
@@
-104,6
+117,8
@@
test: ${JQ}
@@echo " - Copying over script files."
@@cp -fR ${BUILD_DIR}/test/data ${TEST_DIR}/data
@@cp -f ${BUILD_DIR}/test/index.html ${TEST_DIR}
@@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 " - Compiling Test Cases"
@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}