Commit a3e18a30 by Will Daly

Clarify naming of Javascript minify task

parent c80d9141
...@@ -32,7 +32,7 @@ install-nltk-data: ...@@ -32,7 +32,7 @@ install-nltk-data:
STATIC_JS = openassessment/xblock/static/js STATIC_JS = openassessment/xblock/static/js
minimize-js: install-js javascript:
node_modules/.bin/uglifyjs $(STATIC_JS)/src/oa_shared.js $(STATIC_JS)/src/*.js > "$(STATIC_JS)/openassessment.min.js" node_modules/.bin/uglifyjs $(STATIC_JS)/src/oa_shared.js $(STATIC_JS)/src/*.js > "$(STATIC_JS)/openassessment.min.js"
...@@ -40,7 +40,7 @@ install-test: ...@@ -40,7 +40,7 @@ install-test:
pip install -q -r requirements/test.txt pip install -q -r requirements/test.txt
install: install-system install-node install-wheels install-python install-js install-nltk-data install-test minimize-js install: install-system install-node install-wheels install-python install-js install-nltk-data install-test javascript
test: test:
./scripts/test.sh ./scripts/test.sh
...@@ -47,7 +47,7 @@ to start the server on port 8001: ...@@ -47,7 +47,7 @@ to start the server on port 8001:
./scripts/workbench.sh 8001 ./scripts/workbench.sh 8001
Combining and Minimizing JavaScript and Sass Combining and Minifying JavaScript and Sass
============================================ ============================================
To reduce page size, the OpenAssessment XBlock serves combined/minified To reduce page size, the OpenAssessment XBlock serves combined/minified
...@@ -60,7 +60,7 @@ files: ...@@ -60,7 +60,7 @@ files:
.. code:: bash .. code:: bash
# Combine/minify JavaScript # Combine/minify JavaScript
make minimize-js make javascript
# Combine/minify CSS (from Sass) # Combine/minify CSS (from Sass)
./scripts/sass.sh ./scripts/sass.sh
......
...@@ -6,7 +6,7 @@ cd `dirname $BASH_SOURCE` && cd .. ...@@ -6,7 +6,7 @@ cd `dirname $BASH_SOURCE` && cd ..
# Install dependencies # Install dependencies
make install-python make install-python
make install-js make install-js
make minimize-js make javascript
# Configure Django settings # Configure Django settings
export DJANGO_SETTINGS_MODULE="settings.dev" export DJANGO_SETTINGS_MODULE="settings.dev"
......
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