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/08/30 01:59:00 UTC
[2/7] js commit: CB-7219 Added back version file,
added default value for compute-commit-id.js
CB-7219 Added back version file, added default value for compute-commit-id.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/d1e0a91f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/d1e0a91f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/d1e0a91f
Branch: refs/heads/cb-7219
Commit: d1e0a91f89dddb97656021fc5dfae4a8237abb71
Parents: 5e9ff22
Author: Steven Gill <st...@gmail.com>
Authored: Tue Aug 12 13:55:11 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Aug 18 17:09:08 2014 -0700
----------------------------------------------------------------------
VERSION | 1 +
tasks/lib/bundle-browserify.js | 3 +--
tasks/lib/bundle.js | 3 +--
tasks/lib/compute-commit-id.js | 2 ++
4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/d1e0a91f/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..7c69a55
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+3.7.0
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/d1e0a91f/tasks/lib/bundle-browserify.js
----------------------------------------------------------------------
diff --git a/tasks/lib/bundle-browserify.js b/tasks/lib/bundle-browserify.js
index f038117..138d627 100644
--- a/tasks/lib/bundle-browserify.js
+++ b/tasks/lib/bundle-browserify.js
@@ -29,8 +29,7 @@ module.exports = function bundle(platform, debug, commitId, platformVersion) {
var b = browserify({debug: debug});
// XXX plugin_list is not present at this stage
b.ignore(path.join(root, 'src', 'common', 'plugin_list'));
- console.log('commitID: '+ commitId);
- console.log('platformVersion: ' + platformVersion);
+
b.transform(require_tr.transform);
b.add(path.join(root, 'src', platform, 'exec.js'));
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/d1e0a91f/tasks/lib/bundle.js
----------------------------------------------------------------------
diff --git a/tasks/lib/bundle.js b/tasks/lib/bundle.js
index d3282ec..b68eacf 100644
--- a/tasks/lib/bundle.js
+++ b/tasks/lib/bundle.js
@@ -29,8 +29,7 @@ module.exports = function bundle(platform, debug, commitId, platformVersion) {
var scripts = collectFiles(path.join('src', 'scripts'));
modules[''] = path.join('src', 'cordova.js');
copyProps(modules, collectFiles(path.join('src', platform)));
- console.log('commitID: '+ commitId);
- console.log('platformVersion: ' + platformVersion);
+
if (platform === 'test') {
// Add any platform-specific modules that have tests to the test bundle.
var testFilesPath = path.join('src', 'android', 'android');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/d1e0a91f/tasks/lib/compute-commit-id.js
----------------------------------------------------------------------
diff --git a/tasks/lib/compute-commit-id.js b/tasks/lib/compute-commit-id.js
index 8471a05..794ebd9 100644
--- a/tasks/lib/compute-commit-id.js
+++ b/tasks/lib/compute-commit-id.js
@@ -50,6 +50,8 @@ module.exports = function computeCommitId(callback, cachedGitVersion) {
done(stdout);
}
});
+ } else {
+ done('???');
}
function done(stdout) {