From b59cc60162b99cc2682d7a2a28a859962f31a906 Mon Sep 17 00:00:00 2001 From: Hans Christian Reinl Date: Mon, 9 Sep 2013 18:49:47 +0200 Subject: [PATCH] Restructre copying of files and dist-folder structure Use a folder for each version distributed version. Closes #11. --- CHANGELOG.md | 1 + Gruntfile.js | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba837aa..68e3574 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### HEAD +* Restructre copying of files and dist-folder structure (#11) * Add Grunt task to optimize images (#26) * Add documentation about how to write modules with Sass * Add default markup (#31) diff --git a/Gruntfile.js b/Gruntfile.js index 81c6923..5d3a8e2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -23,7 +23,7 @@ module.exports = function (grunt) { // Build modernizr modernizr: { devFile: 'components/modernizr/modernizr.js', - outputFile : 'dist/js/vendor/modernizr-for-<%= pkg.version %>.min.js', + outputFile : 'dist/<%= pkg.version %>/modernizr.min.js', extra: { shiv: true, @@ -52,7 +52,7 @@ module.exports = function (grunt) { style: 'compressed' }, files: { - 'dist/css/main-<%= pkg.version %>.min.css': 'scss/main.scss' + 'dist/<%= pkg.version %>/main.min.css': 'scss/main.scss' } } @@ -67,7 +67,7 @@ module.exports = function (grunt) { options: { mainConfigFile: 'js/config.js', include: ['../components/requirejs/require'], - out: 'dist/js/main-<%= pkg.version %>.min.js' + out: 'dist/<%= pkg.version %>/main.min.js' } } }, @@ -140,8 +140,8 @@ module.exports = function (grunt) { // Setup concurrent tasks concurrent: { - deploy1: ['jshint', 'connect:test', 'jasmine', 'clean', 'modernizr', 'sass:deploy', 'imagemin', 'copy'], - deploy2: ['requirejs'], + deploy1: ['jshint', 'clean', 'modernizr', 'sass:deploy', 'imagemin', 'copy'], + deploy2: ['requirejs', 'connect:test', 'jasmine'], dev1: ['jshint', 'connect:test', 'jasmine', 'sass:dev', 'copy'], dev2: ['requirejs'] }