From 57342272e6c2c74894c4d2fa56344044f4350e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20Mari=C8=99?= Date: Wed, 11 Mar 2015 08:17:57 +0200 Subject: [PATCH] Include the `LICENSE` file in the `dist` directory * Rename `LICENSE.md` to `LICENSE.txt` so that more text editors know how to open it. * Make the build step copy the `LICENSE.txt` file in the `dist/` directory so that it gets included in the distribution package. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ref https://www.youtube.com/watch?v=hWDSToC9EV8&t=15m15s h5bp/html5-boilerplate#1655 Fix h5bp/html5-boilerplate#1655 Close h5bp/html5-boilerplate#1680 --- CHANGELOG.md | 2 ++ LICENSE.md => LICENSE.txt | 0 README.md | 5 +++++ dist/LICENSE.txt | 19 +++++++++++++++++++ gulpfile.js | 6 ++++++ package.json | 2 +- test/file_existence.js | 1 + 7 files changed, 34 insertions(+), 1 deletion(-) rename LICENSE.md => LICENSE.txt (100%) create mode 100644 dist/LICENSE.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index f32d2c1004..d56c41c6df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ### HEAD +* Include the `LICENSE.txt` file in the `dist/` directory + ([#1655](https://github.com/h5bp/html5-boilerplate/issues/1655)). * Remove the `visibility: hidden` declaration from `.hidden` ([#1663](https://github.com/h5bp/html5-boilerplate/issues/1663)). * Use ``
diff --git a/LICENSE.md b/LICENSE.txt similarity index 100% rename from LICENSE.md rename to LICENSE.txt diff --git a/README.md b/README.md index d4312cb311..5c7d5c9069 100644 --- a/README.md +++ b/README.md @@ -64,3 +64,8 @@ want to write about your project. Anyone and everyone is welcome to [contribute](CONTRIBUTING.md). Hundreds of developers have helped make the HTML5 Boilerplate what it is today. + + +## License + +The code is available under the [MIT license](LICENSE.txt). diff --git a/dist/LICENSE.txt b/dist/LICENSE.txt new file mode 100644 index 0000000000..294e91d808 --- /dev/null +++ b/dist/LICENSE.txt @@ -0,0 +1,19 @@ +Copyright (c) HTML5 Boilerplate + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/gulpfile.js b/gulpfile.js index 941eeaa627..5c9b386834 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -66,6 +66,7 @@ gulp.task('copy', [ 'copy:.htaccess', 'copy:index.html', 'copy:jquery', + 'copy:license', 'copy:main.css', 'copy:misc', 'copy:normalize' @@ -89,6 +90,11 @@ gulp.task('copy:jquery', function () { .pipe(gulp.dest(dirs.dist + '/js/vendor')); }); +gulp.task('copy:license', function () { + return gulp.src('LICENSE.txt') + .pipe(gulp.dest(dirs.dist)); +}); + gulp.task('copy:main.css', function () { var banner = '/*! HTML5 Boilerplate v' + pkg.version + diff --git a/package.json b/package.json index 6f230e7945..6ba793a422 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "homepage": "https://html5boilerplate.com/", "license": { "type": "MIT", - "url": "https://github.com/h5bp/html5-boilerplate/blob/master/LICENSE.md" + "url": "https://github.com/h5bp/html5-boilerplate/blob/master/LICENSE.txt" }, "name": "html5-boilerplate", "private": true, diff --git a/test/file_existence.js b/test/file_existence.js index 2f8ff6d475..ecc9376d18 100644 --- a/test/file_existence.js +++ b/test/file_existence.js @@ -52,6 +52,7 @@ var expectedFilesInDistDir = [ 'js/vendor/jquery-' + pkg.devDependencies.jquery + '.min.js', 'js/vendor/modernizr-2.8.3.min.js', + 'LICENSE.txt', 'robots.txt', 'tile-wide.png', 'tile.png'