From 119476ca7443cdf32e1d202ab266d058103e8eb6 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Mon, 8 Aug 2016 10:04:43 +0100 Subject: [PATCH] Reorder license steps in Gruntfile.js (#359) --- .gitignore | 2 +- Gruntfile.js | 26 ++++++------ license/LICENSES | 108 +++++++++++++++++++++++------------------------ 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/.gitignore b/.gitignore index c647bb32d..0b17ff268 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ git-svn-diff.py *.~ *.log application/sessions/* -.licenses +license/.licenses diff --git a/Gruntfile.js b/Gruntfile.js index 9e12adb55..20b5e4f74 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -184,6 +184,16 @@ module.exports = function(grunt) { } } }, + license: { + all: { + // Target-specific file lists and/or options go here. + options: { + // Target-specific options go here. + directory: 'bower_components', + output: 'license/LICENSES' + }, + }, + }, 'bower-licensechecker': { options: { /*directory: 'path/to/bower',*/ @@ -196,7 +206,7 @@ module.exports = function(grunt) { noGood: true }, log: { - outFile: '.licenses', + outFile: 'license/.licenses', nonBower: true, noLicense: true, allGood: true, @@ -204,23 +214,13 @@ module.exports = function(grunt) { } } }, - license: { - all: { - // Target-specific file lists and/or options go here. - options: { - // Target-specific options go here. - directory: 'bower_components', - output: 'license/LICENSES' - }, - }, - }, }); require('load-grunt-tasks')(grunt); grunt.loadNpmTasks('grunt-mocha-webdriver'); - grunt.loadNpmTasks('grunt-bower-licensechecker'); grunt.loadNpmTasks('grunt-license-bower'); + grunt.loadNpmTasks('grunt-bower-licensechecker'); - grunt.registerTask('default', ['wiredep', 'bower_concat', 'bowercopy', 'concat', 'uglify', 'cssmin', 'tags', 'cachebreaker', 'bower-licensechecker', 'license']); + grunt.registerTask('default', ['wiredep', 'bower_concat', 'bowercopy', 'concat', 'uglify', 'cssmin', 'tags', 'cachebreaker', 'license', 'bower-licensechecker']); }; diff --git a/license/LICENSES b/license/LICENSES index a93f9453c..1ff4c2259 100644 --- a/license/LICENSES +++ b/license/LICENSES @@ -1,43 +1,29 @@ { - "chartist-plugin-pointlabels@0.0.4": { - "licenses": [ - "WTF*" - ] - }, - "jquery-form@3.45.0": { - "licenses": "UNKNOWN" - }, - "bootstrap3-dialog@1.35.2": { - "licenses": "UNKNOWN", - "homepage": "http://nakupanda.github.io/bootstrap3-dialog/" - }, "jquery@undefined": { "licenses": [ "MIT" ] }, - "chartist@undefined": { - "licenses": "UNKNOWN" - }, "bootstrap-select@undefined": { "licenses": [ "MIT" ], "homepage": "http://silviomoreto.github.io/bootstrap-select" }, - "js-cookie@undefined": { + "jquery-form@3.45.0": { + "licenses": "UNKNOWN" + }, + "chartist-plugin-axistitle@0.0.1": { "licenses": [ - "MIT" + "WTF*" ] }, - "moment@undefined": { - "licenses": [ - "MIT*" - ] + "chartist@undefined": { + "licenses": "UNKNOWN" }, - "chartist-plugin-tooltip@undefined": { + "chartist-plugin-pointlabels@0.0.4": { "licenses": [ - "MIT*" + "WTF*" ] }, "tableExport.jquery.plugin@undefined": { @@ -45,11 +31,20 @@ "MIT" ] }, - "chartist-plugin-axistitle@0.0.1": { + "js-cookie@undefined": { "licenses": [ - "WTF*" + "MIT" ] }, + "chartist-plugin-tooltip@undefined": { + "licenses": [ + "MIT*" + ] + }, + "bootstrap3-dialog@1.35.2": { + "licenses": "UNKNOWN", + "homepage": "http://nakupanda.github.io/bootstrap3-dialog/" + }, "file-saver.js@1.20150507.2": { "licenses": [ "LICENSE.md" @@ -68,12 +63,18 @@ ], "homepage": "https://github.com/dbtek/bootswatch-dist" }, - "remarkable-bootstrap-notify@3.1.3": { + "smalot-bootstrap-datetimepicker@undefined": { + "licenses": [ + "Apache 2.0", + "Apache*" + ], + "repository": "https://github.com/smalot/bootstrap-datetimepicker" + }, + "jquery-ui@1.11.4": { "licenses": [ "MIT" ], - "homepage": "http://bootstrap-notify.remabledesigns.com/", - "repository": "https://github.com/mouse0270/bootstrap-notify" + "repository": "https://github.com/jquery/jquery-ui" }, "bootstrap-table@undefined": { "licenses": [ @@ -82,12 +83,30 @@ "homepage": "https://github.com/wenzhixin/bootstrap-table", "repository": "git+https://github.com/wenzhixin/bootstrap-table" }, + "moment@undefined": { + "licenses": [ + "MIT*" + ] + }, + "remarkable-bootstrap-notify@3.1.3": { + "licenses": [ + "MIT" + ], + "homepage": "http://bootstrap-notify.remabledesigns.com/", + "repository": "https://github.com/mouse0270/bootstrap-notify" + }, "bootstrap-daterangepicker@undefined": { "licenses": [ "MIT" ], "repository": "git+https://github.com/dangrossman/bootstrap-daterangepicker" }, + "html2canvas@0.4.1": { + "licenses": [ + "MIT" + ], + "repository": "git+ssh://git@github.com/niklasvh/html2canvas" + }, "jspdf-autotable@undefined": { "licenses": [ "MIT" @@ -95,6 +114,13 @@ "homepage": "https://github.com/simonbengtsson/jspdf-autotable", "repository": "git+https://github.com/simonbengtsson/jsPDF-AutoTable" }, + "jquery-validation@1.13.1": { + "licenses": [ + "MIT" + ], + "repository": "https://github.com/jzaefferer/jquery-validation", + "homepage": "http://jqueryvalidation.org/" + }, "bootstrap@undefined": { "licenses": [ "MIT" @@ -102,37 +128,11 @@ "homepage": "http://getbootstrap.com", "repository": "git+https://github.com/twbs/bootstrap" }, - "html2canvas@0.4.1": { - "licenses": [ - "MIT" - ], - "repository": "git+ssh://git@github.com/niklasvh/html2canvas" - }, - "jquery-ui@1.11.4": { - "licenses": [ - "MIT" - ], - "repository": "https://github.com/jquery/jquery-ui" - }, "jasny-bootstrap@3.1.3": { "licenses": [ "Apache-2.0", "Apache*" ], "repository": "git+https://github.com/jasny/bootstrap" - }, - "smalot-bootstrap-datetimepicker@undefined": { - "licenses": [ - "Apache 2.0", - "Apache*" - ], - "repository": "https://github.com/smalot/bootstrap-datetimepicker" - }, - "jquery-validation@1.13.1": { - "licenses": [ - "MIT" - ], - "repository": "https://github.com/jzaefferer/jquery-validation", - "homepage": "http://jqueryvalidation.org/" } } \ No newline at end of file