|
@@ -1,7 +1,6 @@
|
|
|
/* jshint node:true */
|
|
/* jshint node:true */
|
|
|
'use strict';
|
|
'use strict';
|
|
|
module.exports = function (grunt) {
|
|
module.exports = function (grunt) {
|
|
|
-
|
|
|
|
|
var os = require('os');
|
|
var os = require('os');
|
|
|
var config = {
|
|
var config = {
|
|
|
pkg: grunt.file.readJSON('package.json'),
|
|
pkg: grunt.file.readJSON('package.json'),
|
|
@@ -13,6 +12,10 @@ module.exports = function (grunt) {
|
|
|
platform: process.platform.replace('win32', 'windows'),
|
|
platform: process.platform.replace('win32', 'windows'),
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+ if (process.platform.match(/^win/)) {
|
|
|
|
|
+ config.arch = process.env.hasOwnProperty('ProgramFiles(x86)') ? 'x64' : 'x86';
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
|
|
config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
|
|
|
|
|
|
|
|
// load plugins
|
|
// load plugins
|
|
@@ -35,7 +38,6 @@ module.exports = function (grunt) {
|
|
|
|
|
|
|
|
// Merge that object with what with whatever we have here
|
|
// Merge that object with what with whatever we have here
|
|
|
loadConfig(config,'./tasks/options/');
|
|
loadConfig(config,'./tasks/options/');
|
|
|
-
|
|
|
|
|
// pass the config to grunt
|
|
// pass the config to grunt
|
|
|
grunt.initConfig(config);
|
|
grunt.initConfig(config);
|
|
|
};
|
|
};
|