From 91bce0abb49e1a20f1eb63f9ff48abaea0007c4c Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sat, 16 Aug 2014 13:52:45 +0200 Subject: [PATCH] Update build process. --- makefile.js | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/makefile.js b/makefile.js index b5bf7545..43291c6a 100644 --- a/makefile.js +++ b/makefile.js @@ -21,19 +21,6 @@ module.exports = function (make) { make.defaults('build'); - make.before(function () { - - var moment = make.moment(); - - make.env = { - pkg: pkg, - stamp: moment.format('YYYY-MM-DD HH:mm:ss') - }; - - $.info({ method: 'before', message: pkg.version + ' ' + make.env.stamp }); - }); - - make.target('check-version', [], 'add git info to dev builds').async(function (done, fail) { if (!pkg.develop) { @@ -85,29 +72,32 @@ module.exports = function (make) { make.target('build', ['check-version'], 'build all updated files').sync(function () { - var header = '/* ' + pkg.name + ' ' + pkg.version + ' - ' + pkg.homepage + ' */'; + var env = {pkg: pkg}; + var header = '/* ' + pkg.name + ' ' + pkg.version + ' - ' + pkg.homepage + ' */\n'; $(src + ': _h5ai/client/js/*.js') .newerThan(mapSrc, $(src + ': _h5ai/client/js/**')) .includify() - .uglifyjs({header: header}) + .uglifyjs() + .wrap(header) .WRITE(mapSrc); $(src + ': _h5ai/client/css/*.less') .newerThan(mapSrc, $(src + ': _h5ai/client/css/**')) .less() - .cssmin({header: header}) + .cssmin() + .wrap(header) .WRITE(mapSrc); $(src + ': **/*.jade') .newerThan(mapSrc) - .handlebars(make.env) + .handlebars(env) .jade() .WRITE(mapSrc); $(src + ': **, ! _h5ai/client/js/**, ! _h5ai/client/css/**, ! **/*.jade') .newerThan(mapSrc) - .handlebars(make.env) + .handlebars(env) .WRITE(mapSrc); $(src + ': _h5ai/client/css/fonts/**') @@ -122,27 +112,32 @@ module.exports = function (make) { make.target('build-uncompressed', ['check-version'], 'build all updated files without compression').sync(function () { + var env = {pkg: pkg}; + var header = '/* ' + pkg.name + ' ' + pkg.version + ' - ' + pkg.homepage + ' */\n'; + $(src + ': _h5ai/client/js/*.js') .newerThan(mapSrc, $(src + ': _h5ai/client/js/**')) .includify() // .uglifyjs() + .wrap(header) .WRITE(mapSrc); $(src + ': _h5ai/client/css/*.less') .newerThan(mapSrc, $(src + ': _h5ai/client/css/**')) .less() // .cssmin() + .wrap(header) .WRITE(mapSrc); $(src + ': **/*.jade') .newerThan(mapSrc) - .handlebars(make.env) + .handlebars(env) .jade() .WRITE(mapSrc); $(src + ': **, ! _h5ai/client/js/**, ! _h5ai/client/css/**, ! **/*.jade') .newerThan(mapSrc) - .handlebars(make.env) + .handlebars(env) .WRITE(mapSrc); $(src + ': _h5ai/client/css/fonts/**')