diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-07 01:12:30 +0100 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-07 01:12:30 +0100 |
| commit | 810fa35a1cc6af84d78cac74b21c78df27f77280 (patch) | |
| tree | d826e7f39a80190ed62d2ac805ca48c12febef98 | |
| parent | d7593d40337993e7cebd4ed46e94e0c4738fc7d4 (diff) | |
pre .4 changes
| -rw-r--r-- | coffee/Gruntfile.coffee | 8 | ||||
| -rw-r--r-- | coffee/Makefile | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/coffee/Gruntfile.coffee b/coffee/Gruntfile.coffee index 7f895d7c3..a01f34e84 100644 --- a/coffee/Gruntfile.coffee +++ b/coffee/Gruntfile.coffee @@ -5,7 +5,7 @@ module.exports = (grunt) -> grunt.initConfig meta: - pkg: grunt.file.readJSON('package.json>') + pkg: grunt.file.readJSON('package.json') version: '<%= meta.pkg.version %>' banner: '/**\n' + ' * <%= meta.pkg.description %> - v<%= meta.version %>\n' + @@ -27,10 +27,10 @@ module.exports = (grunt) -> concat: app: src: [ - '<%= meta.banner %>' - '<%= meta.prefix %>' + '<banner:meta.banner>' + '<banner:meta.prefix>' '<%= meta.build %>main.js' - '<%= meta.suffix %>' + '<banner:meta.suffix>' ] dest: '<%= meta.production %>app.js' owncloud: diff --git a/coffee/Makefile b/coffee/Makefile index 966a6ba76..68ea18599 100644 --- a/coffee/Makefile +++ b/coffee/Makefile @@ -6,11 +6,11 @@ deps: npm install --save-dev watch: compile - $(CURDIR)/node_modules/.bin/grunt --config $(CURDIR)/grunt.coffee run + $(CURDIR)/node_modules/.bin/grunt --config $(CURDIR)/Gruntfile.coffee run compile: mkdir -p $(CURDIR)/build - $(CURDIR)/node_modules/.bin/grunt --config $(CURDIR)/grunt.coffee compile + $(CURDIR)/node_modules/.bin/grunt --config $(CURDIR)/Gruntfile.coffee compile clean: rm -rf $(CURDIR)/build |