mirror of
https://github.com/Doodle3D/doodle3d-client.git
synced 2024-12-04 14:04:54 +01:00
Log git/version information in web console (#305).
The information is dynamically inserted when grunt is run.
This commit is contained in:
parent
533968bb04
commit
4a3da30ebd
9
.gitignore
vendored
9
.gitignore
vendored
@ -18,18 +18,11 @@ img/logo/logo_smaller.png
|
|||||||
img/logo/logo_smaller_8bit.png
|
img/logo/logo_smaller_8bit.png
|
||||||
img/logo/logo_smaller_wide_8bit.png
|
img/logo/logo_smaller_wide_8bit.png
|
||||||
img/logo/logo_smallest.png
|
img/logo/logo_smallest.png
|
||||||
css/_backup20131010/*
|
|
||||||
css/_backup20131011/*
|
|
||||||
d3d_btns.css
|
d3d_btns.css
|
||||||
index.html.orig
|
|
||||||
js/Thermometer.js.orig
|
|
||||||
js/buttonbehaviors.js.orig
|
|
||||||
js/gcodeGenerating_v01.js.orig
|
|
||||||
js/init_layout backup20130918.js
|
|
||||||
js/main.js.orig
|
js/main.js.orig
|
||||||
js/previewRendering_v02.js.orig
|
|
||||||
less/verticalshapes.css
|
less/verticalshapes.css
|
||||||
less/verticalshapes_backup.css
|
less/verticalshapes_backup.css
|
||||||
__settings.html
|
__settings.html
|
||||||
css/_settings.css
|
css/_settings.css
|
||||||
node_modules/*
|
node_modules/*
|
||||||
|
js/main.js.out
|
||||||
|
2
.settings/com.eclipsesource.jshint.ui.prefs
Normal file
2
.settings/com.eclipsesource.jshint.ui.prefs
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
eclipse.preferences.version=1
|
||||||
|
included=//*.js
|
32
Gruntfile.js
32
Gruntfile.js
@ -10,6 +10,31 @@ module.exports = function(grunt) {
|
|||||||
'<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
|
'<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
|
||||||
'* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
|
'* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
|
||||||
' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n',
|
' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n',
|
||||||
|
gitinfo: {
|
||||||
|
options: {},
|
||||||
|
commands: { 'tag': ['tag', '--points-at', 'HEAD'] }
|
||||||
|
},
|
||||||
|
template: {
|
||||||
|
'add_build_info': {
|
||||||
|
options: {
|
||||||
|
data: function() {
|
||||||
|
grunt.task.requires('gitinfo');
|
||||||
|
var gi = grunt.config('gitinfo');
|
||||||
|
var lbc = gi.local.branch.current;
|
||||||
|
|
||||||
|
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 + "/" + tag +
|
||||||
|
" (" + lbc.lastCommitTime.slice(1, -1) + "; \'" + commitMsg + "'";
|
||||||
|
return { 'build_info': buildInfo };
|
||||||
|
}
|
||||||
|
},
|
||||||
|
files: {
|
||||||
|
'js/main.js.out': ['js/main.js']
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
concat: {
|
concat: {
|
||||||
options: {
|
options: {
|
||||||
// separator: ';'
|
// separator: ';'
|
||||||
@ -22,7 +47,8 @@ module.exports = function(grunt) {
|
|||||||
'js/*.js',
|
'js/*.js',
|
||||||
// make sure we put main.js last
|
// make sure we put main.js last
|
||||||
'!js/main.js',
|
'!js/main.js',
|
||||||
'js/main.js', ],
|
'js/main.js.out'
|
||||||
|
],
|
||||||
dest: 'www/js/<%= pkg.name %>.js'
|
dest: 'www/js/<%= pkg.name %>.js'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -129,6 +155,8 @@ module.exports = function(grunt) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// These plugins provide necessary tasks.
|
// These plugins provide necessary tasks.
|
||||||
|
grunt.loadNpmTasks('grunt-gitinfo');
|
||||||
|
grunt.loadNpmTasks('grunt-template');
|
||||||
grunt.loadNpmTasks('grunt-contrib-less');
|
grunt.loadNpmTasks('grunt-contrib-less');
|
||||||
grunt.loadNpmTasks('grunt-contrib-concat');
|
grunt.loadNpmTasks('grunt-contrib-concat');
|
||||||
grunt.loadNpmTasks('grunt-contrib-uglify');
|
grunt.loadNpmTasks('grunt-contrib-uglify');
|
||||||
@ -139,6 +167,8 @@ module.exports = function(grunt) {
|
|||||||
|
|
||||||
// Default task.
|
// Default task.
|
||||||
grunt.registerTask('default', [
|
grunt.registerTask('default', [
|
||||||
|
'gitinfo',
|
||||||
|
'template',
|
||||||
'less',
|
'less',
|
||||||
'autoprefixer',
|
'autoprefixer',
|
||||||
'cssmin',
|
'cssmin',
|
||||||
|
@ -34,7 +34,8 @@ var POPUP_SHOW_DURATION = 175;
|
|||||||
var BUTTON_GROUP_SHOW_DURATION = 80;
|
var BUTTON_GROUP_SHOW_DURATION = 80;
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
console.log("ready");
|
console.log("Doodle3D client ready");
|
||||||
|
console.log("Build information - <%= build_info %>)");
|
||||||
|
|
||||||
if (getURLParameter("d") != "null") debugMode = (getURLParameter("d") == "1");
|
if (getURLParameter("d") != "null") debugMode = (getURLParameter("d") == "1");
|
||||||
if (getURLParameter("p") != "null") sendPrintCommands = (getURLParameter("p") == "1");
|
if (getURLParameter("p") != "null") sendPrintCommands = (getURLParameter("p") == "1");
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
"author": "Peter Uithoven, Adriaan Wormgoor, Rick Companje, Wouter Reckman",
|
"author": "Peter Uithoven, Adriaan Wormgoor, Rick Companje, Wouter Reckman",
|
||||||
"readmeFilename": "README.md",
|
"readmeFilename": "README.md",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"grunt": "~0.4.1",
|
"grunt": "~0.4.5",
|
||||||
"grunt-cli": "~0.1.9",
|
"grunt-cli": "~0.1.9",
|
||||||
"grunt-contrib-less": "~0.7.0",
|
"grunt-contrib-less": "~0.7.0",
|
||||||
"grunt-contrib-watch": "~0.5.3",
|
"grunt-contrib-watch": "~0.5.3",
|
||||||
@ -17,6 +17,8 @@
|
|||||||
"grunt-contrib-jshint": "~0.6.4",
|
"grunt-contrib-jshint": "~0.6.4",
|
||||||
"grunt-autoprefixer": "~0.4.0",
|
"grunt-autoprefixer": "~0.4.0",
|
||||||
"grunt-contrib-cssmin": "~0.6.2",
|
"grunt-contrib-cssmin": "~0.6.2",
|
||||||
"grunt-contrib-concat": "~0.3.0"
|
"grunt-contrib-concat": "~0.3.0",
|
||||||
|
"grunt-gitinfo": "~0.1.7",
|
||||||
|
"grunt-template": "~0.2.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user