You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2014/09/25 00:52:44 UTC
[7/9] git commit: computeCommitId for browserify workflow fixed to
handle cli and non cli workflows:q
computeCommitId for browserify workflow fixed to handle cli and non cli workflows:q
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/97c89398
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/97c89398
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/97c89398
Branch: refs/heads/master
Commit: 97c893986b764d99d0973f3447a1ae605a307286
Parents: 744b272
Author: Steven Gill <st...@gmail.com>
Authored: Tue Sep 23 18:34:49 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Sep 23 18:34:49 2014 -0700
----------------------------------------------------------------------
cordova-lib/src/plugman/prepare-browserify.js | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/97c89398/cordova-lib/src/plugman/prepare-browserify.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/prepare-browserify.js b/cordova-lib/src/plugman/prepare-browserify.js
index e537856..000b9bb 100644
--- a/cordova-lib/src/plugman/prepare-browserify.js
+++ b/cordova-lib/src/plugman/prepare-browserify.js
@@ -112,12 +112,23 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
requireTr.platform = platform;
var platformVersion;
+ //console.log(project_dir);
computeCommitId(function(commitId) {
//run version script for each platform to get platformVersion
- childProcess.exec(path.join(process.cwd(), 'platforms/' + platform + '/cordova/version'), function(err, stdout, stderr) {
+ var versionPath = path.join(project_dir, '/cordova/version');
+ if(!fs.existsSync(versionPath)) {
+ //non cli project
+ console.log('non cli');
+ console.log(project_dir);
+ versionPath = path.join(project_dir, '/cordova/version');
+ console.log(platform);
+ }
+ childProcess.exec(versionPath, function(err, stdout, stderr) {
+ console.log(versionPath);
if (err) {
platformVersion = 'N/A';
console.log('Error running platform version script');
+ console.log(err);
} else {
platformVersion = stdout.trim();
console.log('platformVersion: ' + platformVersion);