From 3e55f1c64859a93e1ddc74ab45a30c8eed1fe9e8 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 17 Aug 2014 17:30:22 +0200 Subject: [PATCH] Update build process. --- makefile.js | 21 +++++++-------------- src/_h5ai/client/js/scripts.js | 2 +- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/makefile.js b/makefile.js index 31ba28e2..3a9abc55 100644 --- a/makefile.js +++ b/makefile.js @@ -21,27 +21,20 @@ module.exports = function (make) { var child_process = require('child_process'); - child_process.exec('git rev-list --tags --max-count=1', {cwd: root}, function (err, out) { + child_process.exec('git rev-list v' + pkg.version + '..HEAD', {cwd: root}, function (err, out) { - if (err) { - callback(); - } else { - child_process.exec('git rev-list ' + out.trim() + '..HEAD', {cwd: root}, function (err, out) { - - if (err) { - callback(); - } else { - var lines = out.trim().split(/\r?\n/); - callback('+' + lines.length + '~' + lines[0].substring(0, 7)); - } - }); + try { + var lines = out.trim().split(/\r?\n/); + callback('+' + lines.length + '~' + lines[0].substring(0, 7)); + } catch (e) { + callback('+X'); } }); }; make.version('>=0.10.0'); - make.defaults('build'); + make.defaults('release'); make.target('check-version', [], 'add git info to dev builds').async(function (done, fail) { diff --git a/src/_h5ai/client/js/scripts.js b/src/_h5ai/client/js/scripts.js index 8999bbbb..ead7852e 100644 --- a/src/_h5ai/client/js/scripts.js +++ b/src/_h5ai/client/js/scripts.js @@ -18,7 +18,7 @@ (function () { 'use strict'; - /*global jQuery, marked, Modernizr, moment, _ */ + /*global jQuery, marked, Modernizr, moment, Prism, _ */ modulejs.define('$', function () { return jQuery; }); modulejs.define('marked', function () { return marked; }); modulejs.define('modernizr', function () { return Modernizr; });