You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bh...@apache.org on 2014/05/30 21:36:43 UTC
webworks commit: CB-5654 Log 'native' Cordova version during
framework bootstrap
Repository: cordova-blackberry
Updated Branches:
refs/heads/master 05d0b2787 -> e31ab3fa5
CB-5654 Log 'native' Cordova version during framework bootstrap
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/e31ab3fa
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/e31ab3fa
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/e31ab3fa
Branch: refs/heads/master
Commit: e31ab3fa55f63beb3e79fae153e886ad6dcfa1da
Parents: 05d0b27
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Fri May 30 10:25:37 2014 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Fri May 30 15:36:23 2014 -0400
----------------------------------------------------------------------
blackberry10/bin/lib/create.js | 9 ++++++++-
blackberry10/framework/lib/config/default.js | 2 ++
blackberry10/framework/lib/framework.js | 3 +++
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/e31ab3fa/blackberry10/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/create.js b/blackberry10/bin/lib/create.js
index 7765082..45bcb09 100644
--- a/blackberry10/bin/lib/create.js
+++ b/blackberry10/bin/lib/create.js
@@ -151,11 +151,18 @@ function copyFilesToProject() {
//copy framework bootstrap
TARGETS.forEach(function (target) {
var chromeDir = path.join(native_dir, target, "chrome"),
- frameworkLibDir = path.join(chromeDir, "lib");
+ frameworkLibDir = path.join(chromeDir, "lib"),
+ defaultConfig;
wrench.mkdirSyncRecursive(frameworkLibDir);
wrench.copyDirSyncRecursive(BOOTSTRAP_PROJECT_DIR, chromeDir);
wrench.copyDirSyncRecursive(FRAMEWORK_LIB_PROJECT_DIR, frameworkLibDir);
+
+ //apply 'native' Cordova version
+ defaultConfig = fs.readFileSync(path.join(frameworkLibDir, "config", "default.js"));
+ defaultConfig = defaultConfig.toString().replace("CORDOVA-VERSION", version);
+ fs.writeFileSync(path.join(frameworkLibDir, "config", "default.js"), defaultConfig, "utf-8");
+
});
// save release
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/e31ab3fa/blackberry10/framework/lib/config/default.js
----------------------------------------------------------------------
diff --git a/blackberry10/framework/lib/config/default.js b/blackberry10/framework/lib/config/default.js
index b7e09c0..303f26a 100644
--- a/blackberry10/framework/lib/config/default.js
+++ b/blackberry10/framework/lib/config/default.js
@@ -23,6 +23,8 @@ module.exports = {
configXML: "config.xml",
configXMLDoc: null,
+ cordovaVersion: "CORDOVA-VERSION",
+
backButtonBehavior: "back",
customHeaders: {},
version: "1.0.0",
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/e31ab3fa/blackberry10/framework/lib/framework.js
----------------------------------------------------------------------
diff --git a/blackberry10/framework/lib/framework.js b/blackberry10/framework/lib/framework.js
index c661c14..a32b06d 100644
--- a/blackberry10/framework/lib/framework.js
+++ b/blackberry10/framework/lib/framework.js
@@ -80,6 +80,9 @@ var _self = {
var callback,
showUrlCallback;
+ // log Cordova framework version (which should match JS version)
+ console.log('Apache Cordova native platform version ' + config.cordovaVersion + ' is starting.');
+
// Set up the controller WebView
controllerWebView.init(config);