Commit 88a73c47 authored by Tristan Cavelier's avatar Tristan Cavelier

'make' output more explicit

parent 83f49b27
...@@ -39,15 +39,21 @@ LINT_FILES = $(LINT_NAMES:%=$(JIO_DIR)/%.js) $(CONCAT_STORAGE_NAMES:%=$(STORAGE ...@@ -39,15 +39,21 @@ LINT_FILES = $(LINT_NAMES:%=$(JIO_DIR)/%.js) $(CONCAT_STORAGE_NAMES:%=$(STORAGE
# build parser.js # build parser.js
compile: compile:
#
############################## Compile Query Parser ##############################
$(JSCC_CMD) -o $(PARSER_OUT) $(PARSER_PAR) $(JSCC_CMD) -o $(PARSER_OUT) $(PARSER_PAR)
# concat source files into jio.js and complex-queries.js # concat source files into jio.js and complex-queries.js
concat: concat:
#
############################## Concat JIO and Queries ##############################
cat $(CONCAT_JIO_FILES) > "$(JIO)" cat $(CONCAT_JIO_FILES) > "$(JIO)"
cat $(CONCAT_QUERIES_FILES) > "$(COMPLEX)" cat $(CONCAT_QUERIES_FILES) > "$(COMPLEX)"
# uglify into jio.min.js and complex.min.js # uglify into jio.min.js and complex.min.js
uglify: uglify:
#
############################## Uglify JIO and Queries ##############################
$(UGLIFY_CMD) "$(JIO)" > "$(JIO_MIN)" $(UGLIFY_CMD) "$(JIO)" > "$(JIO_MIN)"
$(UGLIFY_CMD) "$(COMPLEX)" > "$(COMPLEX_MIN)" $(UGLIFY_CMD) "$(COMPLEX)" > "$(COMPLEX_MIN)"
...@@ -58,9 +64,13 @@ uglify: ...@@ -58,9 +64,13 @@ uglify:
# /*jslint indent: 2, maxlen: 80 */ # /*jslint indent: 2, maxlen: 80 */
# /*global hex_sha256: true, jQuery: true */ # /*global hex_sha256: true, jQuery: true */
lint: lint:
$(LINT_CMD) $(LINT_FILES) #
############################## Lint All files ##############################
echo; a="$$($(LINT_CMD) $(LINT_FILES))" ; [ $$? != 0 ] && echo "$$a" | grep -v 'OK\.$$' | uniq && false
phantom: phantom:
#
############################## Phantom ##############################
$(PHANTOM_CMD) test/run-qunit.js test/jiotests_withoutrequirejs.html | awk 'BEGIN {print "<!DOCTYPE html><html>"} /^<head>$$/, /^<\/body>$$/ {print} END {print "</html>"}' | sed -e 's,^ *<\(/\|\)script.*>$$,,g' > test/unit_test_result.html $(PHANTOM_CMD) test/run-qunit.js test/jiotests_withoutrequirejs.html | awk 'BEGIN {print "<!DOCTYPE html><html>"} /^<head>$$/, /^<\/body>$$/ {print} END {print "</html>"}' | sed -e 's,^ *<\(/\|\)script.*>$$,,g' > test/unit_test_result.html
grep '^ <title>✔ ' test/unit_test_result.html > /dev/null grep '^ <title>✔ ' test/unit_test_result.html > /dev/null
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment