IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

add option for grunt release

Browse Source
This commit is contained in:
fg2it
2016-09-18 09:13:00 +00:00
parent 174ea11b1c
commit 62a2f80f10
3 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Gruntfile.js
View File

@@ -9,7 +9,6 @@ module.exports = function (grunt) {
genDir: 'public_gen', genDir: 'public_gen',
destDir: 'dist', destDir: 'dist',
tempDir: 'tmp', tempDir: 'tmp',
arch: os.arch(),
platform: process.platform.replace('win32', 'windows'), platform: process.platform.replace('win32', 'windows'),
}; };
@@ -17,6 +16,10 @@ module.exports = function (grunt) {
config.arch = process.env.hasOwnProperty('ProgramFiles(x86)') ? 'x64' : 'x86'; config.arch = process.env.hasOwnProperty('ProgramFiles(x86)') ? 'x64' : 'x86';
} }
config.arch = grunt.option('arch') || os.arch();
config.phjs = grunt.option('phjsToRelease');
config.pkg.version = grunt.option('pkgVer') || config.pkg.version; config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
console.log('Version', config.pkg.version); console.log('Version', config.pkg.version);

2
README.md
View File

@@ -96,7 +96,7 @@ easily the grafana repository you want to build.
```bash ```bash
go get github.com/*your_account*/grafana go get github.com/*your_account*/grafana
mkdir $GOPATH/src/github.com/grafana mkdir $GOPATH/src/github.com/grafana
ln -s github.com/*your_account*/grafana $GOPATH/src/github.com/grafana/grafana ln -s $GOPATH/src/github.com/*your_account*/grafana $GOPATH/src/github.com/grafana/grafana
``` ```
### Building the backend ### Building the backend

72
tasks/options/phantomjs.js
View File

@@ -1,34 +1,38 @@
module.exports = function(config,grunt) { module.exports = function(config,grunt) {
'use strict'; 'use strict';
grunt.registerTask('phantomjs', 'Copy phantomjs binary from node', function() { grunt.registerTask('phantomjs', 'Copy phantomjs binary from node', function() {
var dest = './vendor/phantomjs/phantomjs'; var dest = './vendor/phantomjs/phantomjs';
var confDir = './node_modules/phantomjs-prebuilt/lib/'; var confDir = './node_modules/phantomjs-prebuilt/lib/';
if (!grunt.file.exists(dest)){ if (!grunt.file.exists(dest)){
var m=grunt.file.read(confDir+"location.js") src = config.phjs
var src=/= \"([^\"]*)\"/.exec(m)[1];
if (!src){
if (!grunt.file.isPathAbsolute(src)) { var m=grunt.file.read(confDir+"location.js")
src = confDir+src; var src=/= \"([^\"]*)\"/.exec(m)[1];
}
if (!grunt.file.isPathAbsolute(src)) {
try { src = confDir+src;
grunt.config('copy.phantom_bin', { }
src: src, }
dest: dest,
options: { mode: true}, try {
}); grunt.config('copy.phantom_bin', {
grunt.task.run('copy:phantom_bin'); src: src,
} catch (err) { dest: dest,
grunt.verbose.writeln(err); options: { mode: true},
grunt.fail.warn('No working Phantomjs binary available') });
} grunt.task.run('copy:phantom_bin');
} catch (err) {
} else { grunt.verbose.writeln(err);
grunt.log.writeln('Phantomjs already imported from node'); grunt.fail.warn('No working Phantomjs binary available')
} }
});
}; } else {
grunt.log.writeln('Phantomjs already imported from node');
}
});
};