Skip to content

J
jio
Commit 7aa49403 authored by Tristan Cavelier's avatar Tristan Cavelier
Browse files
Options

Makefile updated; can use node jslint and node uglify-js

parent dda2573d
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
Makefile
View file @ 7aa49403
OUT = jio.js OUT = jio.js
UGLY_OUT = jio.min.js UGLY_OUT = jio.min.js
LINT_CMD = jslint --terse # npm install jslint
UGLIFY_CMD = uglifyjs LINT_CMD = $(shell which jslint || echo node ~/node_modules/jslint/bin/jslint.js) --terse
# npm install uglify-js
UGLIFY_CMD = $(shell which uglifyjs || echo node ~/node_modules/uglify-js/bin/uglifyjs)
FILE_DIR = src/jio FILE_DIR = src/jio
STORAGE_DIR = src/jio.storage STORAGE_DIR = src/jio.storage
...@@ -19,7 +21,7 @@ concat: ...@@ -19,7 +21,7 @@ concat:
# uglify jio.js to build jio.min.js # uglify jio.js to build jio.min.js
uglify: uglify:
$(UGLIFY_CMD) -- "$(OUT)" > "$(UGLY_OUT)" $(UGLIFY_CMD) "$(OUT)" > "$(UGLY_OUT)"
# lint all files in FILES and STORAGE_FILES # lint all files in FILES and STORAGE_FILES
# command: jslint [options] file # command: jslint [options] file
...@@ -28,7 +30,7 @@ uglify: ...@@ -28,7 +30,7 @@ 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:%=$(FILE_DIR)/%.js) $(LINT_CMD) $(LINT_FILES:%=$(FILE_DIR)/%.js)
.phony: clean .phony: clean
clean: clean:
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7