git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0cd3821
)
Moved the test directory.
author
John Resig
<jeresig@gmail.com>
Sun, 13 Aug 2006 20:01:26 +0000
(20:01 +0000)
committer
John Resig
<jeresig@gmail.com>
Sun, 13 Aug 2006 20:01:26 +0000
(20:01 +0000)
18 files changed:
Makefile
patch
|
blob
|
history
build/js/lib/Test/Builder.js
[moved from
test/lib/Test/Builder.js
with 100% similarity]
patch
|
blob
|
history
build/js/lib/Test/Harness.js
[moved from
test/lib/Test/Harness.js
with 100% similarity]
patch
|
blob
|
history
build/js/lib/Test/Harness/Browser.js
[moved from
test/lib/Test/Harness/Browser.js
with 100% similarity]
patch
|
blob
|
history
build/js/lib/Test/Harness/Director.js
[moved from
test/lib/Test/Harness/Director.js
with 100% similarity]
patch
|
blob
|
history
build/js/lib/Test/More.js
[moved from
test/lib/Test/More.js
with 100% similarity]
patch
|
blob
|
history
build/js/lib/Test/Simple.js
[moved from
test/lib/Test/Simple.js
with 100% similarity]
patch
|
blob
|
history
build/js/lib/Test/tmp.js
[moved from
test/lib/Test/tmp.js
with 100% similarity]
patch
|
blob
|
history
build/js/lib/Test/tmp2.js
[moved from
test/lib/Test/tmp2.js
with 100% similarity]
patch
|
blob
|
history
build/js/lib/test.js
[moved from
test/lib/test.js
with 100% similarity]
patch
|
blob
|
history
build/test/index.html
[moved from
test/index.html
with 100% similarity]
patch
|
blob
|
history
build/test/tests/basic.html
[moved from
test/tests/basic.html
with 100% similarity]
patch
|
blob
|
history
build/test/tests/css1.html
[moved from
test/tests/css1.html
with 100% similarity]
patch
|
blob
|
history
build/test/tests/css2.html
[moved from
test/tests/css2.html
with 100% similarity]
patch
|
blob
|
history
build/test/tests/css3.html
[moved from
test/tests/css3.html
with 100% similarity]
patch
|
blob
|
history
build/test/tests/custom.html
[moved from
test/tests/custom.html
with 100% similarity]
patch
|
blob
|
history
build/test/tests/prereq.html
[moved from
test/tests/prereq.html
with 100% similarity]
patch
|
blob
|
history
build/test/tests/xpath.html
[moved from
test/tests/xpath.html
with 100% similarity]
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
0a65e8a
..
f0be47f
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-11,6
+11,8
@@
JQ = ${DIST_DIR}/jquery.js
JQ_LITE = ${DIST_DIR}/jquery.lite.js
JQ_PACK = ${DIST_DIR}/jquery.pack.js
JQ_LITE = ${DIST_DIR}/jquery.lite.js
JQ_PACK = ${DIST_DIR}/jquery.pack.js
+JAR = java -jar ${BUILD_DIR}/js.jar
+
all: jquery lite pack docs
@@echo "jQuery build complete."
all: jquery lite pack docs
@@echo "jQuery build complete."
@@
-27,7
+29,7
@@
${JQ}:
cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
done
cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
done
- @@echo ${JQ} "built."
+ @@echo ${JQ} "Built"
@@echo
lite: ${JQ_LITE}
@@echo
lite: ${JQ_LITE}
@@
-35,8
+37,8
@@
lite: ${JQ_LITE}
${JQ_LITE}: jquery
@@echo "Building" ${JQ_LITE}
@@echo " - Removing ScriptDoc from" ${JQ}
${JQ_LITE}: jquery
@@echo "Building" ${JQ_LITE}
@@echo " - Removing ScriptDoc from" ${JQ}
- @@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
- @@echo ${JQ_LITE} "built."
+ @@${JAR} ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
+ @@echo ${JQ_LITE} "Built"
@@echo
pack: ${JQ_PACK}
@@echo
pack: ${JQ_PACK}
@@
-44,11
+46,24
@@
pack: ${JQ_PACK}
${JQ_PACK}: jquery
@@echo "Building" ${JQ_PACK}
@@echo " - Compressing using Packer"
${JQ_PACK}: jquery
@@echo "Building" ${JQ_PACK}
@@echo " - Compressing using Packer"
- @@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
- @@echo ${JQ_PACK} "built."
+ @@${JAR} ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
+ @@echo ${JQ_PACK} "Built"
@@echo
test: ${JQ}
@@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"
docs: ${JQ}
@@echo "Building Documentation"
@@
-64,11
+79,17
@@
docs: ${JQ}
@@cp -R ${BUILD_DIR}/docs/style ${DOCS_DIR}/style
@@echo " - Extracting ScriptDoc from" ${JQ}
@@cp -R ${BUILD_DIR}/docs/style ${DOCS_DIR}/style
@@echo " - Extracting ScriptDoc from" ${JQ}
- @@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
+ @@${JAR} ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
- @@echo "Documentation built."
+ @@echo "Documentation Built"
@@echo
clean:
@@echo
clean:
+ @@echo "Removing Distribution directory:" ${DIST_DIR}
@@rm -rf ${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}
@@rm -rf ${DOCS_DIR}
diff --git
a/test/lib/Test/Builder.js
b/build/js/lib/Test/Builder.js
similarity index 100%
rename from
test/lib/Test/Builder.js
rename to
build/js/lib/Test/Builder.js
diff --git
a/test/lib/Test/Harness.js
b/build/js/lib/Test/Harness.js
similarity index 100%
rename from
test/lib/Test/Harness.js
rename to
build/js/lib/Test/Harness.js
diff --git
a/test/lib/Test/Harness/Browser.js
b/build/js/lib/Test/Harness/Browser.js
similarity index 100%
rename from
test/lib/Test/Harness/Browser.js
rename to
build/js/lib/Test/Harness/Browser.js
diff --git
a/test/lib/Test/Harness/Director.js
b/build/js/lib/Test/Harness/Director.js
similarity index 100%
rename from
test/lib/Test/Harness/Director.js
rename to
build/js/lib/Test/Harness/Director.js
diff --git
a/test/lib/Test/More.js
b/build/js/lib/Test/More.js
similarity index 100%
rename from
test/lib/Test/More.js
rename to
build/js/lib/Test/More.js
diff --git
a/test/lib/Test/Simple.js
b/build/js/lib/Test/Simple.js
similarity index 100%
rename from
test/lib/Test/Simple.js
rename to
build/js/lib/Test/Simple.js
diff --git
a/test/lib/Test/tmp.js
b/build/js/lib/Test/tmp.js
similarity index 100%
rename from
test/lib/Test/tmp.js
rename to
build/js/lib/Test/tmp.js
diff --git
a/test/lib/Test/tmp2.js
b/build/js/lib/Test/tmp2.js
similarity index 100%
rename from
test/lib/Test/tmp2.js
rename to
build/js/lib/Test/tmp2.js
diff --git
a/test/lib/test.js
b/build/js/lib/test.js
similarity index 100%
rename from
test/lib/test.js
rename to
build/js/lib/test.js
diff --git
a/test/index.html
b/build/test/index.html
similarity index 100%
rename from
test/index.html
rename to
build/test/index.html
diff --git
a/test/tests/basic.html
b/build/test/tests/basic.html
similarity index 100%
rename from
test/tests/basic.html
rename to
build/test/tests/basic.html
diff --git
a/test/tests/css1.html
b/build/test/tests/css1.html
similarity index 100%
rename from
test/tests/css1.html
rename to
build/test/tests/css1.html
diff --git
a/test/tests/css2.html
b/build/test/tests/css2.html
similarity index 100%
rename from
test/tests/css2.html
rename to
build/test/tests/css2.html
diff --git
a/test/tests/css3.html
b/build/test/tests/css3.html
similarity index 100%
rename from
test/tests/css3.html
rename to
build/test/tests/css3.html
diff --git
a/test/tests/custom.html
b/build/test/tests/custom.html
similarity index 100%
rename from
test/tests/custom.html
rename to
build/test/tests/custom.html
diff --git
a/test/tests/prereq.html
b/build/test/tests/prereq.html
similarity index 100%
rename from
test/tests/prereq.html
rename to
build/test/tests/prereq.html
diff --git
a/test/tests/xpath.html
b/build/test/tests/xpath.html
similarity index 100%
rename from
test/tests/xpath.html
rename to
build/test/tests/xpath.html