Commit 62a2f80f by fg2it

add option for grunt release

parent 174ea11b
...@@ -9,7 +9,6 @@ module.exports = function (grunt) { ...@@ -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) { ...@@ -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);
......
...@@ -96,7 +96,7 @@ easily the grafana repository you want to build. ...@@ -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
......
...@@ -8,12 +8,16 @@ module.exports = function(config,grunt) { ...@@ -8,12 +8,16 @@ module.exports = function(config,grunt) {
if (!grunt.file.exists(dest)){ if (!grunt.file.exists(dest)){
src = config.phjs
if (!src){
var m=grunt.file.read(confDir+"location.js") var m=grunt.file.read(confDir+"location.js")
var src=/= \"([^\"]*)\"/.exec(m)[1]; var src=/= \"([^\"]*)\"/.exec(m)[1];
if (!grunt.file.isPathAbsolute(src)) { if (!grunt.file.isPathAbsolute(src)) {
src = confDir+src; src = confDir+src;
} }
}
try { try {
grunt.config('copy.phantom_bin', { grunt.config('copy.phantom_bin', {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment