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/02/08 00:40:25 UTC
[1/3] git commit: Revert "updated platform.js to point to 3.3.0"
Updated Branches:
refs/heads/master dffe397f1 -> 7f1b02fae
Revert "updated platform.js to point to 3.3.0"
This reverts commit dffe397f159a487a6e455b715c78427465dc2d63.
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/b8881751
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/b8881751
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/b8881751
Branch: refs/heads/master
Commit: b8881751bf762d4272b9119f9d9a6dd3de95fbad
Parents: dffe397
Author: Steven Gill <st...@gmail.com>
Authored: Fri Feb 7 15:38:37 2014 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Fri Feb 7 15:38:37 2014 -0800
----------------------------------------------------------------------
package.json | 2 +-
platforms.js | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/b8881751/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index e467e79..72daaa6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova",
- "version": "3.3.1-0.4.1",
+ "version": "3.3.1-0.4.0",
"preferGlobal": "true",
"description": "Cordova command line interface tool",
"main": "cordova",
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/b8881751/platforms.js
----------------------------------------------------------------------
diff --git a/platforms.js b/platforms.js
index be7f2cb..2e23480 100644
--- a/platforms.js
+++ b/platforms.js
@@ -21,54 +21,54 @@ module.exports = {
'ios' : {
parser : './src/metadata/ios_parser',
url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-ios.git',
- version: '3.3.0'
+ version: '3.4.0-rc1'
},
'android' : {
parser : './src/metadata/android_parser',
url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-android.git',
- version: '3.3.0'
+ version: '3.4.0-rc1'
},
'ubuntu' : {
parser : './src/metadata/ubuntu_parser',
url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-ubuntu.git',
- version: '3.3.0'
+ version: '3.4.0-rc1'
},
'amazon-fireos' : {
parser : './src/metadata/amazon_fireos_parser',
url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-amazon-fireos.git',
- version: '3.3.0'
+ version: '3.4.0-rc1'
},
'wp7' : {
parser : './src/metadata/wp7_parser',
url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-wp8.git',
- version: '3.3.0',
+ version: '3.4.0-rc1',
subdirectory: 'wp7'
},
'wp8' : {
parser : './src/metadata/wp8_parser',
url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-wp8.git',
- version: '3.3.0',
+ version: '3.4.0-rc1',
subdirectory: 'wp8'
},
'blackberry10' : {
parser : './src/metadata/blackberry10_parser',
url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-blackberry.git',
- version: '3.3.0',
+ version: '3.4.0-rc1',
subdirectory: 'blackberry10'
},
'www':{
url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-app-hello-world.git',
- version: '3.3.0'
+ version: '3.4.0-rc1'
},
'firefoxos':{
parser: './src/metadata/firefoxos_parser',
url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-firefoxos.git',
- version: '3.3.0'
+ version: '3.4.0-rc1'
},
'windows8':{
parser: './src/metadata/windows8_parser',
url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-windows.git',
- version: '3.3.0',
+ version: '3.4.0-rc1',
subdirectory: 'windows8'
}
};
[2/3] git commit: Unrevert "Add a check to config_parser that root
tag is ."
Posted by st...@apache.org.
Unrevert "Add a check to config_parser that root tag is <widget>."
This reverts commit 134aa64055965a5119aafc87d74ce4031dc0b80a.
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/8727029b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/8727029b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/8727029b
Branch: refs/heads/master
Commit: 8727029b58f4330d1a805f1cdbffcb86e4769264
Parents: b888175
Author: Steven Gill <st...@gmail.com>
Authored: Fri Feb 7 15:38:55 2014 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Fri Feb 7 15:38:55 2014 -0800
----------------------------------------------------------------------
src/config_parser.js | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/8727029b/src/config_parser.js
----------------------------------------------------------------------
diff --git a/src/config_parser.js b/src/config_parser.js
index b6293d8..4267d30 100644
--- a/src/config_parser.js
+++ b/src/config_parser.js
@@ -27,6 +27,11 @@ function config_parser(path) {
} catch (e) {
throw new Error("Parsing "+path+" failed:\n"+e.message);
}
+ var r = this.doc.getroot();
+ var xmlns ='http://www.w3.org/ns/widgets';
+ if((r.tag !== 'widget') || !r.attrib || (r.attrib.xmlns !== xmlns)) {
+ throw new Error("This file does not seem to be a cordova config.xml file: " + path);
+ }
this.access = new access(this);
this.preference = new preference(this);
}
[3/3] git commit: updated version in prep for 3.4.0
Posted by st...@apache.org.
updated version in prep for 3.4.0
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/7f1b02fa
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/7f1b02fa
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/7f1b02fa
Branch: refs/heads/master
Commit: 7f1b02fae563ac896c87f5946cda8889e081f7b3
Parents: 8727029
Author: Steven Gill <st...@gmail.com>
Authored: Fri Feb 7 15:40:21 2014 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Fri Feb 7 15:40:21 2014 -0800
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/7f1b02fa/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 72daaa6..68334f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova",
- "version": "3.3.1-0.4.0",
+ "version": "3.4.0-rc.1-dev",
"preferGlobal": "true",
"description": "Cordova command line interface tool",
"main": "cordova",