Compare commits
5 Commits
Author | SHA1 | Date |
---|---|---|
peteruithoven | f8032d7411 | |
peteruithoven | 2acb06c3ed | |
peteruithoven | daed62937c | |
peteruithoven | 058fff8b34 | |
peteruithoven | 28808078ad |
|
@ -22,10 +22,11 @@ module.exports = function(grunt) {
|
|||
var gi = grunt.config('gitinfo');
|
||||
var lbc = gi.local.branch.current;
|
||||
|
||||
var tag = (gi.tag == '') ? 'no_tag' : gi.tag;
|
||||
var tags = (gi.tag == '') ? 'no_tag' : gi.tag;
|
||||
tags = tags.split('\n').join(',');
|
||||
var commitMsg = lbc.lastCommitMessage.slice(1, -1).split('\n')[0].replace(/"/g, '\\\"');
|
||||
|
||||
var buildInfo = lbc.shortSHA + "/" + lbc.name + "/" + tag +
|
||||
var buildInfo = lbc.shortSHA + "/" + lbc.name + "/" + tags +
|
||||
" (" + lbc.lastCommitTime.slice(1, -1) + "; \'" + commitMsg + "'";
|
||||
return { 'build_info': buildInfo };
|
||||
}
|
||||
|
|
4
Makefile
4
Makefile
|
@ -48,9 +48,9 @@ define Build/Compile
|
|||
# grunt can access git info
|
||||
npm install
|
||||
ifeq ($(CONFIG_DOODLE3D_CLIENT_MINIFY_JS),y)
|
||||
grunt gitinfo less autoprefixer cssmin concat uglify
|
||||
grunt gitinfo template less autoprefixer cssmin concat uglify
|
||||
else
|
||||
grunt gitinfo less autoprefixer cssmin concat
|
||||
grunt gitinfo template less autoprefixer cssmin concat
|
||||
endif
|
||||
# Copy compiled files to build dir
|
||||
$(CP) www $(PKG_BUILD_DIR)/
|
||||
|
|
|
@ -20,5 +20,8 @@
|
|||
"grunt-contrib-concat": "~0.3.0",
|
||||
"grunt-gitinfo": "~0.1.7",
|
||||
"grunt-template": "~0.2.3"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "grunt"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue