Updated Branches: refs/heads/master f2a815bce -> 5dd5091fa
CB-5192 Plugman engine check fails on Windows Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/5dd5091f Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/5dd5091f Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/5dd5091f Branch: refs/heads/master Commit: 5dd5091fa33679312e3c1a3bc748d9091503e9cd Parents: f2a815b Author: sgrebnov <[email protected]> Authored: Thu Oct 24 10:27:46 2013 +0400 Committer: sgrebnov <[email protected]> Committed: Thu Oct 24 10:27:46 2013 +0400 ---------------------------------------------------------------------- src/install.js | 14 ++++++++++---- src/util/default-engines.js | 6 +++--- 2 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/5dd5091f/src/install.js ---------------------------------------------------------------------- diff --git a/src/install.js b/src/install.js index 550e0c5..c0a4de9 100644 --- a/src/install.js +++ b/src/install.js @@ -9,7 +9,9 @@ var path = require('path'), config_changes = require('./util/config-changes'), xml_helpers = require('./util/xml-helpers'), Q = require('q'), - platform_modules = require('./platforms'); + platform_modules = require('./platforms'), + os = require('os'), + isWindows = (os.platform() === 'win32'); /* INSTALL FLOW ------------ @@ -116,12 +118,16 @@ function callEngineScripts(engines) { return Q.all( engines.map(function(engine){ - if(fs.existsSync(engine.scriptSrc)){ - fs.chmodSync(engine.scriptSrc, '755'); + // CB-5192; on Windows scriptSrc doesn't have file extension so we shouldn't check whether the script exists + if(isWindows || fs.existsSync(engine.scriptSrc)){ + + if(!isWindows) { // not required on Windows + fs.chmodSync(engine.scriptSrc, '755'); + } var d = Q.defer(); child_process.exec(engine.scriptSrc, function(error, stdout, stderr) { if (error) { - require('../plugman').emit('log', 'Cordova project '+ engine.scriptSrc +' script failed (has a '+ engine.scriptSrc +' script, but something went wrong executing it), continuing anyways.'); + require('../plugman').emit('log', 'Cordova project '+ engine.scriptSrc +' script failed, continuing anyways.'); engine.currentVersion = null; d.resolve(engine); // Yes, resolve. We're trying to continue despite the error. } else { http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/5dd5091f/src/util/default-engines.js ---------------------------------------------------------------------- diff --git a/src/util/default-engines.js b/src/util/default-engines.js index 8fa20e7..f7d42e1 100644 --- a/src/util/default-engines.js +++ b/src/util/default-engines.js @@ -14,11 +14,11 @@ module.exports = function(project_dir){ 'cordova-blackberry10': { 'platform':'blackberry10', 'scriptSrc': path.join(project_dir,'cordova','version') }, 'cordova-wp7': - { 'platform':'wp7', 'scriptSrc': path.join(project_dir,'cordova','version.bat') }, + { 'platform':'wp7', 'scriptSrc': path.join(project_dir,'cordova','version') }, 'cordova-wp8': - { 'platform':'wp8', 'scriptSrc': path.join(project_dir,'cordova','version.bat') }, + { 'platform':'wp8', 'scriptSrc': path.join(project_dir,'cordova','version') }, 'cordova-windows8': - { 'platform':'windows8', 'scriptSrc': path.join(project_dir,'cordova','version.bat') }, + { 'platform':'windows8', 'scriptSrc': path.join(project_dir,'cordova','version') }, // TODO: these scripts have not been made! 'apple-xcode' :
