Commit e2fdf56b authored by Tristan Cavelier's avatar Tristan Cavelier

Rhino is not used anymore, js/cc is used by node now.

To install js/cc type: sh -c 'cd ; npm install jscc-node'
parent 24b49022
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
JIO_DIR = src/jio JIO_DIR = src/jio
STORAGE_DIR = src/jio.storage STORAGE_DIR = src/jio.storage
QUERIES_DIR = src/queries QUERIES_DIR = src/queries
JSCC_DIR = ~/modules/jscc
# files # files
JIO = jio.js JIO = jio.js
...@@ -12,11 +11,13 @@ COMPLEX_MIN = complex_queries.min.js ...@@ -12,11 +11,13 @@ COMPLEX_MIN = complex_queries.min.js
PARSER_PAR = $(QUERIES_DIR)/parser.par PARSER_PAR = $(QUERIES_DIR)/parser.par
PARSER_OUT = $(QUERIES_DIR)/parser.js PARSER_OUT = $(QUERIES_DIR)/parser.js
# using rhino ## js/cc using rhino
JSCC_CMD = rhino $(JSCC_DIR)/jscc.js -t $(JSCC_DIR)/driver_web.js_ #JSCC_CMD = rhino ~/modules/jscc/jscc.js -t ~/modules/jscc/driver_web.js_
# npm install jslint # sh -c 'cd ; npm install jscc-node'
JSCC_CMD = node ~/node_modules/jscc-node/jscc.js -t ~/node_modules/jscc-node/driver_node.js_
# sh -c 'cd ; npm install jslint'
LINT_CMD = $(shell which jslint || echo node ~/node_modules/jslint/bin/jslint.js) --terse LINT_CMD = $(shell which jslint || echo node ~/node_modules/jslint/bin/jslint.js) --terse
# npm install uglify-js # sh -c 'cd ; npm install uglify-js'
UGLIFY_CMD = $(shell which uglifyjs || echo node ~/node_modules/uglify-js/bin/uglifyjs) UGLIFY_CMD = $(shell which uglifyjs || echo node ~/node_modules/uglify-js/bin/uglifyjs)
auto: compile build lint auto: compile build lint
......
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