Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1F45111415 for ; Tue, 12 Aug 2014 20:55:22 +0000 (UTC) Received: (qmail 74455 invoked by uid 500); 12 Aug 2014 20:55:22 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 74431 invoked by uid 500); 12 Aug 2014 20:55:22 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 74422 invoked by uid 99); 12 Aug 2014 20:55:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Aug 2014 20:55:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BF48F9901F3; Tue, 12 Aug 2014 20:55:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: js commit: CB-7219 Added back version file, added default value for compute-commit-id.js Date: Tue, 12 Aug 2014 20:55:21 +0000 (UTC) Repository: cordova-js Updated Branches: refs/heads/cb-7219 71113eb61 -> 416fbd1e2 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/416fbd1e Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/416fbd1e Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/416fbd1e Branch: refs/heads/cb-7219 Commit: 416fbd1e2125b505ee4614f5a4c8b9d038a209b2 Parents: 71113eb Author: Steven Gill Authored: Tue Aug 12 13:55:11 2014 -0700 Committer: Steven Gill Committed: Tue Aug 12 13:55:11 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/416fbd1e/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/416fbd1e/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/416fbd1e/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/416fbd1e/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) {