0
0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2025-04-30 15:10:49 +02:00

Compare commits

..

No commits in common. "master" and "0.10.11-a" have entirely different histories.

3 changed files with 4 additions and 8 deletions

View File

@ -22,11 +22,10 @@ module.exports = function(grunt) {
var gi = grunt.config('gitinfo');
var lbc = gi.local.branch.current;
var tags = (gi.tag == '') ? 'no_tag' : gi.tag;
tags = tags.split('\n').join(',');
var tag = (gi.tag == '') ? 'no_tag' : gi.tag;
var commitMsg = lbc.lastCommitMessage.slice(1, -1).split('\n')[0].replace(/"/g, '\\\"');
var buildInfo = lbc.shortSHA + "/" + lbc.name + "/" + tags +
var buildInfo = lbc.shortSHA + "/" + lbc.name + "/" + tag +
" (" + lbc.lastCommitTime.slice(1, -1) + "; \'" + commitMsg + "'";
return { 'build_info': buildInfo };
}

View File

@ -48,9 +48,9 @@ define Build/Compile
# grunt can access git info
npm install
ifeq ($(CONFIG_DOODLE3D_CLIENT_MINIFY_JS),y)
grunt gitinfo template less autoprefixer cssmin concat uglify
grunt gitinfo less autoprefixer cssmin concat uglify
else
grunt gitinfo template less autoprefixer cssmin concat
grunt gitinfo less autoprefixer cssmin concat
endif
# Copy compiled files to build dir
$(CP) www $(PKG_BUILD_DIR)/

View File

@ -20,8 +20,5 @@
"grunt-contrib-concat": "~0.3.0",
"grunt-gitinfo": "~0.1.7",
"grunt-template": "~0.2.3"
},
"scripts": {
"start": "grunt"
}
}