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 2013/09/13 01:35:57 UTC
[16/16] git commit: fixed merge conflicts in package.json
fixed merge conflicts in package.json
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/f5621044
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/f5621044
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/f5621044
Branch: refs/heads/ffos
Commit: f56210447bf2cf001e35717e5c66019eccf7e235
Parents: de8f547 9196137
Author: Steven Gill <st...@gmail.com>
Authored: Thu Sep 12 16:33:16 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Thu Sep 12 16:33:16 2013 -0700
----------------------------------------------------------------------
package.json | 4 ++
platforms.js | 5 ++
src/metadata/firefoxos_parser.js | 122 ++++++++++++++++++++++++++++++++++
3 files changed, 131 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f5621044/package.json
----------------------------------------------------------------------
diff --cc package.json
index 40e6af5,904c5c6..bd318e0
--- a/package.json
+++ b/package.json
@@@ -53,94 -52,29 +53,98 @@@
},
"author": "Anis Kadri",
"contributors": [
- {"name": "Brian LeRoux","email": "b@brian.io"},
- {"name": "Fil Maj", "email": "maj.fil@gmail.com"},
- {"name": "Mike Reinstein", "email":"reinstein.mike@gmail.com"},
- {"name": "Darry Pogue", "email":"darryl@dpogue.ca"},
- {"name": "Michael Brooks", "email":"michael@michaelbrooks.ca"},
- {"name": "Braden Shepherdson", "email":"braden@chromium.org"},
- {"name": "Gord Tanner", "email":"gtanner@gmail.com"},
- {"name": "Tim Kim", "email": "timk@adobe.com"},
- {"name": "Benn Mapes", "email": "Benn.Mapes@gmail.com"},
- {"name": "Michael Wolf", "email": "Michael.Wolf@Cynergy.com"},
- {"name": "Andrew Grieve", "email": "agrieve@chromium.org"},
- {"name": "Bryan Higgins", "email": "bhiggins@blackberry.com"},
- {"name": "Don Coleman", "email": "dcoleman@chariotsolutions.com"},
- {"name": "Germano Gabbianelli", "email": "tyron.mx@gmail.com"},
- {"name": "Ian Clelland", "email": "iclelland@chromium.org"},
- {"name": "Lucas Holmqust", "email": "lholmqui@redhat.com"},
- {"name": "Matt LeGrand", "email": "mlegrand@gmail.com"},
- {"name": "Michal Mocny", "email": "mmocny@gmail.com"},
- {"name": "Sam Breed", "email": "sam@quickleft.com"},
- {"name": "Tommy-Carlos Williams", "email": "tommy@devgeeks.org"},
- {"name": "Rubén Norte", "email": "rubennorte@gmail.com"},
- {"name": "Germano Gabbianelli", "email": "tyrion.mx@gmail.com"},
- {"name": "Steven Gill", "email": "stevengill97@gmail.com"}
+ {
+ "name": "Brian LeRoux",
+ "email": "b@brian.io"
+ },
+ {
+ "name": "Fil Maj",
+ "email": "maj.fil@gmail.com"
+ },
+ {
+ "name": "Mike Reinstein",
+ "email": "reinstein.mike@gmail.com"
+ },
+ {
+ "name": "Darry Pogue",
+ "email": "darryl@dpogue.ca"
+ },
+ {
+ "name": "Michael Brooks",
+ "email": "michael@michaelbrooks.ca"
+ },
+ {
+ "name": "Braden Shepherdson",
+ "email": "braden@chromium.org"
+ },
+ {
+ "name": "Gord Tanner",
+ "email": "gtanner@gmail.com"
+ },
+ {
+ "name": "Tim Kim",
+ "email": "timk@adobe.com"
+ },
+ {
+ "name": "Benn Mapes",
+ "email": "Benn.Mapes@gmail.com"
+ },
+ {
+ "name": "Michael Wolf",
+ "email": "Michael.Wolf@Cynergy.com"
+ },
+ {
+ "name": "Andrew Grieve",
+ "email": "agrieve@chromium.org"
+ },
+ {
+ "name": "Bryan Higgins",
+ "email": "bhiggins@blackberry.com"
+ },
+ {
+ "name": "Don Coleman",
+ "email": "dcoleman@chariotsolutions.com"
+ },
+ {
+ "name": "Germano Gabbianelli",
+ "email": "tyron.mx@gmail.com"
+ },
+ {
+ "name": "Ian Clelland",
+ "email": "iclelland@chromium.org"
+ },
+ {
+ "name": "Lucas Holmqust",
+ "email": "lholmqui@redhat.com"
+ },
+ {
+ "name": "Matt LeGrand",
+ "email": "mlegrand@gmail.com"
+ },
+ {
+ "name": "Michal Mocny",
+ "email": "mmocny@gmail.com"
+ },
+ {
+ "name": "Sam Breed",
+ "email": "sam@quickleft.com"
+ },
+ {
+ "name": "Tommy-Carlos Williams",
+ "email": "tommy@devgeeks.org"
+ },
+ {
+ "name": "Rubén Norte",
+ "email": "rubennorte@gmail.com"
+ },
+ {
+ "name": "Germano Gabbianelli",
+ "email": "tyrion.mx@gmail.com"
++ },
++ {
++ "name": "Steven Gill",
++ "email": "stevengill97@gmail.com"
+ }
],
"license": "Apache version 2.0"
}
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f5621044/platforms.js
----------------------------------------------------------------------
diff --cc platforms.js
index 40d0a6b,554fa76..04654b3
--- a/platforms.js
+++ b/platforms.js
@@@ -46,13 -46,10 +46,18 @@@ module.exports =
'www':{
url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-app-hello-world.git',
version: '3.0.0'
+ },
+ 'firefoxos':{
+ parser: require('./src/metadata/firefoxos_parser'),
+ url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-firefoxos.git',
+ version: '3.0.0'
}
};
+
+var addModuleProperty = require('./src/util').addModuleProperty;
+Object.keys(module.exports).forEach(function(key) {
+ var obj = module.exports[key];
+ if (obj.parser) {
+ addModuleProperty(module, 'parser', obj.parser, obj);
+ }
+});