You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2012/08/31 20:40:45 UTC
js commit: Tagging 2.1.0rc2,
also solves CB-1275 (interpolating VERSION file into js-based version
info)
Updated Branches:
refs/heads/master b17e8cdf6 -> 1a7a0b81f
Updated Tags: refs/tags/2.1.0rc2 [created] 1a7a0b81f
Tagging 2.1.0rc2, also solves CB-1275 (interpolating VERSION file into js-based version info)
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/1a7a0b81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/1a7a0b81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/1a7a0b81
Branch: refs/heads/master
Commit: 1a7a0b81fea8ca7dd1b91b79fc4ef26af26cc9da
Parents: b17e8cd
Author: Fil Maj <ma...@gmail.com>
Authored: Fri Aug 31 11:40:11 2012 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Fri Aug 31 11:40:11 2012 -0700
----------------------------------------------------------------------
Jakefile | 20 +++++++++++++++++++-
VERSION | 2 +-
lib/bada/plugin/bada/device.js | 2 +-
lib/tizen/plugin/tizen/Device.js | 2 +-
lib/webworks/air/plugin/air/device.js | 2 +-
lib/webworks/qnx/plugin/qnx/device.js | 2 +-
6 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/1a7a0b81/Jakefile
----------------------------------------------------------------------
diff --git a/Jakefile b/Jakefile
index f8bf5c9..173783d 100644
--- a/Jakefile
+++ b/Jakefile
@@ -57,7 +57,7 @@ task('clean', ['set-cwd'], function () {
}, true);
desc("compiles the source files for all extensions");
-task('build', ['clean', 'hint'], function () {
+task('build', ['clean', 'hint', 'update-version'], function () {
var packager = require("./build/packager");
var commitId = "";
childProcess.exec("git log -1",function(err,stdout,stderr) {
@@ -83,6 +83,24 @@ task('build', ['clean', 'hint'], function () {
});
}, true);
+desc("drops VERSION into JavaScript-based platforms");
+task('update-version', ['set-cwd'], function() {
+ var version = fs.readFileSync("VERSION", "utf-8").toString().split('\n').join('');
+
+ // List of files that need to be interpolated with matching regexes
+ var files = {
+ "lib/bada/plugin/bada/device.js":/(me\.cordova\s=\s").+(")/,
+ "lib/tizen/plugin/tizen/Device.js":/(this\.cordova\s=\s").+(")/,
+ "lib/webworks/qnx/plugin/qnx/device.js":/(cordova:\s").+(")/,
+ "lib/webworks/air/plugin/air/device.js":/(cordova:\s").+(")/
+ };
+
+ for (var f in files) if (files.hasOwnProperty(f)) {
+ var interpolatedContent = fs.readFileSync(f, "utf-8").toString().replace(files[f], "$1" + version + "$2");
+ fs.writeFileSync(f, interpolatedContent);
+ }
+});
+
desc("prints a dalek");
task('dalek', ['set-cwd'], function () {
util.puts(fs.readFileSync("build/dalek", "utf-8"));
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/1a7a0b81/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 0c271bc..51c0fcb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0rc1
+2.1.0rc2
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/1a7a0b81/lib/bada/plugin/bada/device.js
----------------------------------------------------------------------
diff --git a/lib/bada/plugin/bada/device.js b/lib/bada/plugin/bada/device.js
index 02e1f1b..558cd93 100644
--- a/lib/bada/plugin/bada/device.js
+++ b/lib/bada/plugin/bada/device.js
@@ -51,7 +51,7 @@ Device.prototype.getDeviceInfo = function(success, fail, args) {
me.platform = os_vendor + " " + os_name;
me.version = os_version;
me.uuid = uuid;
- me.cordova = "2.1.0rc1";
+ me.cordova = "2.1.0rc2";
success(me);
}
};
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/1a7a0b81/lib/tizen/plugin/tizen/Device.js
----------------------------------------------------------------------
diff --git a/lib/tizen/plugin/tizen/Device.js b/lib/tizen/plugin/tizen/Device.js
index 91015ed..ded3e32 100644
--- a/lib/tizen/plugin/tizen/Device.js
+++ b/lib/tizen/plugin/tizen/Device.js
@@ -8,7 +8,7 @@ function Device() {
this.version = null;
this.uuid = null;
this.name = null;
- this.cordova = "2.1.0rc1";
+ this.cordova = "2.1.0rc2";
this.platform = "Tizen";
var me = this;
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/1a7a0b81/lib/webworks/air/plugin/air/device.js
----------------------------------------------------------------------
diff --git a/lib/webworks/air/plugin/air/device.js b/lib/webworks/air/plugin/air/device.js
index 9ca55e9..36efa46 100644
--- a/lib/webworks/air/plugin/air/device.js
+++ b/lib/webworks/air/plugin/air/device.js
@@ -11,7 +11,7 @@ module.exports = {
version: blackberry.system.softwareVersion,
name: blackberry.system.model,
uuid: blackberry.identity.PIN,
- cordova: "2.1.0rc1"
+ cordova: "2.1.0rc2"
});
return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "Device info returned" };
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/1a7a0b81/lib/webworks/qnx/plugin/qnx/device.js
----------------------------------------------------------------------
diff --git a/lib/webworks/qnx/plugin/qnx/device.js b/lib/webworks/qnx/plugin/qnx/device.js
index 54520a4..54d62b3 100644
--- a/lib/webworks/qnx/plugin/qnx/device.js
+++ b/lib/webworks/qnx/plugin/qnx/device.js
@@ -11,7 +11,7 @@ module.exports = {
version: blackberry.system.softwareVersion,
name: "Dev Alpha",
uuid: blackberry.identity.uuid,
- cordova: "2.1.0rc1"
+ cordova: "2.1.0rc2"
});
return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "Device info returned" };