You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by lo...@apache.org on 2013/05/29 23:56:05 UTC
[3/7] webworks commit: [CB-3473] updated version,
unwound dev label which causes problems with upgrade script
[CB-3473] updated version, unwound dev label which causes problems with upgrade script
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/a5190fb6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/a5190fb6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/a5190fb6
Branch: refs/heads/2.8.x
Commit: a5190fb6b3f8b151342c11bc3d0c62417e0f9f2d
Parents: 9294442
Author: lorinbeer <lo...@adobe.com>
Authored: Wed May 29 13:28:43 2013 -0700
Committer: lorinbeer <lo...@adobe.com>
Committed: Wed May 29 14:55:08 2013 -0700
----------------------------------------------------------------------
blackberry/VERSION | 2 +-
blackberry/bin/templates/project/www/VERSION | 2 +-
.../ext/src/org/apache/cordova/device/Device.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/a5190fb6/blackberry/VERSION
----------------------------------------------------------------------
diff --git a/blackberry/VERSION b/blackberry/VERSION
index 38f8e88..1277c83 100644
--- a/blackberry/VERSION
+++ b/blackberry/VERSION
@@ -1 +1 @@
-dev
+2.8.0rc1
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/a5190fb6/blackberry/bin/templates/project/www/VERSION
----------------------------------------------------------------------
diff --git a/blackberry/bin/templates/project/www/VERSION b/blackberry/bin/templates/project/www/VERSION
index 38f8e88..1277c83 100644
--- a/blackberry/bin/templates/project/www/VERSION
+++ b/blackberry/bin/templates/project/www/VERSION
@@ -1 +1 @@
-dev
+2.8.0rc1
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/a5190fb6/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
----------------------------------------------------------------------
diff --git a/blackberry/framework/ext/src/org/apache/cordova/device/Device.java b/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
index 19934a0..3cfaf42 100644
--- a/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
+++ b/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
@@ -54,7 +54,7 @@ public final class Device extends Plugin {
JSONObject device = new JSONObject();
device.put( FIELD_PLATFORM, "BlackBerry");
device.put( FIELD_UUID, new Integer( DeviceInfo.getDeviceId()) );
- device.put( FIELD_CORDOVA, "dev" );
+ device.put( FIELD_CORDOVA, "2.8.0rc1" );
device.put( FIELD_MODEL, new String(DeviceInfo.getDeviceName()) );
device.put( FIELD_NAME, new String(DeviceInfo.getDeviceName()) );
device.put( FIELD_VERSION, new String(DeviceInfo.getSoftwareVersion()) );
Re: [3/7] webworks commit: [CB-3473] updated version, unwound dev
label which causes problems with upgrade script
Posted by Lorin Beer <lo...@gmail.com>.
Hi Andrew,
I understad you're having a baby today? Congratulations! I didn't even
know you were pregnant!
Unfortunately, the version at 'dev' **really** messes with the ant
version script used on BB. I will retag master to dev once I've
re-written the script, but currently, tagging from dev to anything
changes every "dev" string in the repo to the new tag.
"2.8.0rc1elopers" and "2.8.0rc1ices" and the like.
- Lorin
On Wed, May 29, 2013 at 7:25 PM, Andrew Grieve <ag...@chromium.org> wrote:
> Hey Lorin,
>
> I'm wondering if we can keep VERSION at "dev" on the master branch? It'll
> make it easier to distinguish released versions from dev versions.
>
>
>
>
> ---------- Forwarded message ----------
> From: <lo...@apache.org>
> Date: Wed, May 29, 2013 at 5:56 PM
> Subject: [3/7] webworks commit: [CB-3473] updated version, unwound dev label
> which causes problems with upgrade script
> To: commits@cordova.apache.org
>
>
> [CB-3473] updated version, unwound dev label which causes problems with
> upgrade script
>
>
> Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/a5190fb6
> Tree:
> http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/a5190fb6
> Diff:
> http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/a5190fb6
>
> Branch: refs/heads/2.8.x
> Commit: a5190fb6b3f8b151342c11bc3d0c62417e0f9f2d
> Parents: 9294442
> Author: lorinbeer <lo...@adobe.com>
> Authored: Wed May 29 13:28:43 2013 -0700
> Committer: lorinbeer <lo...@adobe.com>
> Committed: Wed May 29 14:55:08 2013 -0700
>
> ----------------------------------------------------------------------
> blackberry/VERSION | 2 +-
> blackberry/bin/templates/project/www/VERSION | 2 +-
> .../ext/src/org/apache/cordova/device/Device.java | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/a5190fb6/blackberry/VERSION
> ----------------------------------------------------------------------
> diff --git a/blackberry/VERSION b/blackberry/VERSION
> index 38f8e88..1277c83 100644
> --- a/blackberry/VERSION
> +++ b/blackberry/VERSION
> @@ -1 +1 @@
> -dev
> +2.8.0rc1
>
> http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/a5190fb6/blackberry/bin/templates/project/www/VERSION
> ----------------------------------------------------------------------
> diff --git a/blackberry/bin/templates/project/www/VERSION
> b/blackberry/bin/templates/project/www/VERSION
> index 38f8e88..1277c83 100644
> --- a/blackberry/bin/templates/project/www/VERSION
> +++ b/blackberry/bin/templates/project/www/VERSION
> @@ -1 +1 @@
> -dev
> +2.8.0rc1
>
> http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/a5190fb6/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
> ----------------------------------------------------------------------
> diff --git
> a/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
> b/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
> index 19934a0..3cfaf42 100644
> --- a/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
> +++ b/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
> @@ -54,7 +54,7 @@ public final class Device extends Plugin {
> JSONObject device = new JSONObject();
> device.put( FIELD_PLATFORM, "BlackBerry");
> device.put( FIELD_UUID, new Integer(
> DeviceInfo.getDeviceId()) );
> - device.put( FIELD_CORDOVA, "dev" );
> + device.put( FIELD_CORDOVA, "2.8.0rc1" );
> device.put( FIELD_MODEL, new
> String(DeviceInfo.getDeviceName()) );
> device.put( FIELD_NAME, new
> String(DeviceInfo.getDeviceName()) );
> device.put( FIELD_VERSION, new
> String(DeviceInfo.getSoftwareVersion()) );
>
>
Fwd: [3/7] webworks commit: [CB-3473] updated version, unwound dev
label which causes problems with upgrade script
Posted by Andrew Grieve <ag...@chromium.org>.
Hey Lorin,
I'm wondering if we can keep VERSION at "dev" on the master branch? It'll
make it easier to distinguish released versions from dev versions.
---------- Forwarded message ----------
From: <lo...@apache.org>
Date: Wed, May 29, 2013 at 5:56 PM
Subject: [3/7] webworks commit: [CB-3473] updated version, unwound dev
label which causes problems with upgrade script
To: commits@cordova.apache.org
[CB-3473] updated version, unwound dev label which causes problems with
upgrade script
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit:
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/a5190fb6
Tree:
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/a5190fb6
Diff:
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/a5190fb6
Branch: refs/heads/2.8.x
Commit: a5190fb6b3f8b151342c11bc3d0c62417e0f9f2d
Parents: 9294442
Author: lorinbeer <lo...@adobe.com>
Authored: Wed May 29 13:28:43 2013 -0700
Committer: lorinbeer <lo...@adobe.com>
Committed: Wed May 29 14:55:08 2013 -0700
----------------------------------------------------------------------
blackberry/VERSION | 2 +-
blackberry/bin/templates/project/www/VERSION | 2 +-
.../ext/src/org/apache/cordova/device/Device.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/a5190fb6/blackberry/VERSION
----------------------------------------------------------------------
diff --git a/blackberry/VERSION b/blackberry/VERSION
index 38f8e88..1277c83 100644
--- a/blackberry/VERSION
+++ b/blackberry/VERSION
@@ -1 +1 @@
-dev
+2.8.0rc1
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/a5190fb6/blackberry/bin/templates/project/www/VERSION
----------------------------------------------------------------------
diff --git a/blackberry/bin/templates/project/www/VERSION
b/blackberry/bin/templates/project/www/VERSION
index 38f8e88..1277c83 100644
--- a/blackberry/bin/templates/project/www/VERSION
+++ b/blackberry/bin/templates/project/www/VERSION
@@ -1 +1 @@
-dev
+2.8.0rc1
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/a5190fb6/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
----------------------------------------------------------------------
diff --git
a/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
b/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
index 19934a0..3cfaf42 100644
--- a/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
+++ b/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
@@ -54,7 +54,7 @@ public final class Device extends Plugin {
JSONObject device = new JSONObject();
device.put( FIELD_PLATFORM, "BlackBerry");
device.put( FIELD_UUID, new Integer(
DeviceInfo.getDeviceId()) );
- device.put( FIELD_CORDOVA, "dev" );
+ device.put( FIELD_CORDOVA, "2.8.0rc1" );
device.put( FIELD_MODEL, new
String(DeviceInfo.getDeviceName()) );
device.put( FIELD_NAME, new
String(DeviceInfo.getDeviceName()) );
device.put( FIELD_VERSION, new
String(DeviceInfo.getSoftwareVersion()) );