Commit 75a1ff10 by bergquist

tech(build): dont override arch for windows

parent 0abc22f2
...@@ -12,12 +12,16 @@ module.exports = function (grunt) { ...@@ -12,12 +12,16 @@ module.exports = function (grunt) {
platform: process.platform.replace('win32', 'windows'), platform: process.platform.replace('win32', 'windows'),
}; };
if (process.platform.match(/^win/)) { if (grunt.option('arch')) {
config.arch = process.env.hasOwnProperty('ProgramFiles(x86)') ? 'x64' : 'x86'; config.arch = grunt.option('arch')
} else {
config.arch = os.arch()
if (process.platform.match(/^win/)) {
config.arch = process.env.hasOwnProperty('ProgramFiles(x86)') ? 'x64' : 'x86';
}
} }
config.arch = grunt.option('arch') || os.arch();
config.phjs = grunt.option('phjsToRelease'); config.phjs = grunt.option('phjsToRelease');
config.pkg.version = grunt.option('pkgVer') || config.pkg.version; config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
......
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