← Back to branch summary

~ya-bo-ng/juju-gui/test-prototype

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Matthew Scott
  • Date: 2013-07-26 17:33:07 UTC
  • mto: This revision was merged to the branch mainline in revision 902.
  • Revision ID: matthew.scott@canonical.com-20130726173307-q3bvw7eite1ecso7
Builds with d3v3 now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
28
28
        \) -print \
29
29
        | sort | sed -e 's/^\.\///' \
30
30
        | grep -Ev -e '^manifest\.json$$' \
31
 
                -e '^app/assets/javascripts/d3\.v2(\.min)?\.js$$' \
 
31
                -e '^app/assets/javascripts/d3(\.min)?\.js$$' \
32
32
                -e '^app/assets/javascripts/spin\.min\.js$$' \
33
33
                -e '^app/assets/javascripts/spinner\.js$$' \
34
34
                -e '^app/assets/javascripts/js-yaml\.min\.js$$' \
133
133
BUILD_FILES=build-shared/juju-ui/assets/modules.js \
134
134
        build-shared/juju-ui/assets/all-yui.js \
135
135
        build-shared/juju-ui/assets/combined-css/all-static.css
136
 
JAVASCRIPT_LIBRARIES=app/assets/javascripts/d3.v2.js \
137
 
        app/assets/javascripts/d3.v2.min.js app/assets/javascripts/yui
 
136
JAVASCRIPT_LIBRARIES=app/assets/javascripts/d3.js \
 
137
        app/assets/javascripts/d3.min.js app/assets/javascripts/yui
138
138
DATE=$(shell date -u)
139
139
 
140
140
# Some environments, notably sudo, do not populate the default PWD environment
248
248
 
249
249
$(JAVASCRIPT_LIBRARIES): | node_modules/yui node_modules/d3
250
250
        ln -sf "$(PWD)/node_modules/yui" app/assets/javascripts/yui
251
 
        ln -sf "$(PWD)/node_modules/d3/d3.v2.js" app/assets/javascripts/d3.v2.js
252
 
        ln -sf "$(PWD)/node_modules/d3/d3.v2.min.js" \
253
 
                app/assets/javascripts/d3.v2.min.js
 
251
        ln -sf "$(PWD)/node_modules/d3/d3.js" app/assets/javascripts/d3.js
 
252
        ln -sf "$(PWD)/node_modules/d3/d3.min.js" \
 
253
                app/assets/javascripts/d3.min.js
254
254
 
255
255
gjslint: virtualenv/bin/gjslint
256
256
        virtualenv/bin/gjslint --unix --strict --nojsdoc --jslint_error=all \