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/10/28 08:43:48 UTC

[1/2] git commit: CB-7884 Fixed up incorrect JSON

Repository: cordova-lib
Updated Branches:
  refs/heads/cb-7884 [created] 61f5f54d2


CB-7884 Fixed up incorrect JSON


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/61f5f54d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/61f5f54d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/61f5f54d

Branch: refs/heads/cb-7884
Commit: 61f5f54d2ffee5821e4570847c4230f281324476
Parents: 5f40fd1
Author: Steve Gill <st...@gmail.com>
Authored: Tue Oct 28 00:21:45 2014 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Oct 28 00:43:10 2014 -0700

----------------------------------------------------------------------
 cordova-lib/src/cordova/platformsConfig.json | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/61f5f54d/cordova-lib/src/cordova/platformsConfig.json
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platformsConfig.json b/cordova-lib/src/cordova/platformsConfig.json
index 8911997..59422a4 100644
--- a/cordova-lib/src/cordova/platformsConfig.json
+++ b/cordova-lib/src/cordova/platformsConfig.json
@@ -3,23 +3,23 @@
         "hostos": ["darwin"],
         "parser": "./metadata/ios_parser",
         "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-ios.git",
-        "version": “3.6.3”
+        "version": "3.6.3"
     },
     "android": {
         "parser": "./metadata/android_parser",
         "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-android.git",
-        "version": “3.6.4”
+        "version": "3.6.4"
     },
     "ubuntu": {
         "hostos": ["linux"],
         "parser": "./metadata/ubuntu_parser",
         "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-ubuntu.git",
-        "version": “3.6.3”
+        "version": "3.6.3"
     },
     "amazon-fireos": {
         "parser": "./metadata/amazon_fireos_parser",
         "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-amazon-fireos.git",
-        "version": “3.6.3”
+        "version": "3.6.3"
     },
     "wp8": {
         "hostos": ["win32"],
@@ -27,12 +27,12 @@
         "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-wp8.git",
         "version": "b2b1e6185444e0dd6a6b9b19df9005cfc5bc5d80",
         "altplatform": "wp",
-        "subdirectory": “3.6.4”
+        "subdirectory": "3.6.4"
     },
     "blackberry10": {
         "parser": "./metadata/blackberry10_parser",
         "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-blackberry.git",
-        "version": “3.6.3”
+        "version": "3.6.3"
     },
     "www": {
         "hostos": [],
@@ -43,25 +43,25 @@
     "firefoxos": {
         "parser": "./metadata/firefoxos_parser",
         "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-firefoxos.git",
-        "version": “3.6.3”
+        "version": "3.6.3"
     },
     "windows8": {
         "hostos": ["win32"],
         "parser": "./metadata/windows_parser",
         "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-windows.git",
-        "version": "29457595f997a2900aa2eb9e67fdab6c674b061a",
-        "subdirectory": “3.6.4”
+        "version": "3.6.4",
+        "subdirectory": "windows"
     },
     "windows": {
         "hostos": ["win32"],
         "parser": "./metadata/windows_parser",
         "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-windows.git",
-        "version": "29457595f997a2900aa2eb9e67fdab6c674b061a",
-        "subdirectory": “3.6.4”
+        "version": "3.6.4",
+        "subdirectory": "windows"
     },
     "browser": {
         "parser": "./metadata/browser_parser",
         "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-browser.git",
-        "version": “3.6.0”
+        "version": "3.6.0"
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[2/2] git commit: CB-7884 moved platform metadata to platformsConfig.json

Posted by st...@apache.org.
CB-7884 moved platform metadata to platformsConfig.json


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/5f40fd1b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/5f40fd1b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/5f40fd1b

Branch: refs/heads/cb-7884
Commit: 5f40fd1b92b0d5c089ba8625d4472f2a5bfd8d16
Parents: e6f8dc7
Author: Steve Gill <st...@gmail.com>
Authored: Tue Oct 28 00:16:43 2014 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Oct 28 00:43:10 2014 -0700

----------------------------------------------------------------------
 cordova-lib/src/cordova/platforms.js         | 74 ++---------------------
 cordova-lib/src/cordova/platformsConfig.json | 67 ++++++++++++++++++++
 2 files changed, 72 insertions(+), 69 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/5f40fd1b/cordova-lib/src/cordova/platforms.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platforms.js b/cordova-lib/src/cordova/platforms.js
index 1e8800f..171aaba 100644
--- a/cordova-lib/src/cordova/platforms.js
+++ b/cordova-lib/src/cordova/platforms.js
@@ -21,78 +21,14 @@
           indent:4, unused:vars, latedef:nofunc
 */
 
-module.exports = {
-    'ios' : {
-        hostos : ['darwin'],
-        parser : './metadata/ios_parser',
-        url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-ios.git',
-        version: '3.6.3'
-    },
-    'android' : {
-        parser : './metadata/android_parser',
-        url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-android.git',
-        version: '3.6.4'
-    },
-    'ubuntu' : {
-        hostos : ['linux'],
-        parser : './metadata/ubuntu_parser',
-        url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-ubuntu.git',
-        version: '3.6.3'
-    },
-    'amazon-fireos' : {
-        parser : './metadata/amazon_fireos_parser',
-        url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-amazon-fireos.git',
-        version: '3.6.3'
-    },
-    'wp8' : {
-        hostos : ['win32'],
-        parser : './metadata/wp8_parser',
-        url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-wp8.git',
-        version: '3.6.4',
-        altplatform: 'wp',
-        subdirectory: 'wp8'
-    },
-    'blackberry10' : {
-        parser : './metadata/blackberry10_parser',
-        url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-blackberry.git',
-        version: '3.6.3'
-    },
-    'www':{
-        hostos : [],
-        url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-app-hello-world.git',
-        source : 'git',
-        version: '3.6.3'
-    },
-    'firefoxos':{
-        parser: './metadata/firefoxos_parser',
-        url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-firefoxos.git',
-        version: '3.6.3'
-    },
-    'windows8':{
-        hostos : ['win32'],
-        parser: './metadata/windows_parser',
-        url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-windows.git',
-        version: '3.6.4',
-        subdirectory: 'windows'
-    },
-    'windows':{
-        hostos : ['win32'],
-        parser: './metadata/windows_parser',
-        url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-windows.git',
-        version: '3.6.4',
-        subdirectory: 'windows'
-    },
-    'browser':{
-        parser : './metadata/browser_parser',
-        url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-browser.git',
-        version: '3.6.0'
-    }
-};
+var platforms = require('./platformsConfig.json');
 
 var addModuleProperty = require('./util').addModuleProperty;
-Object.keys(module.exports).forEach(function(key) {
-    var obj = module.exports[key];
+Object.keys(platforms).forEach(function(key) {
+    var obj = platforms[key];
     if (obj.parser) {
         addModuleProperty(module, 'parser', obj.parser, false, obj);
     }
 });
+
+module.exports = platforms;

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/5f40fd1b/cordova-lib/src/cordova/platformsConfig.json
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platformsConfig.json b/cordova-lib/src/cordova/platformsConfig.json
new file mode 100644
index 0000000..8911997
--- /dev/null
+++ b/cordova-lib/src/cordova/platformsConfig.json
@@ -0,0 +1,67 @@
+{
+    "ios": {
+        "hostos": ["darwin"],
+        "parser": "./metadata/ios_parser",
+        "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-ios.git",
+        "version": “3.6.3”
+    },
+    "android": {
+        "parser": "./metadata/android_parser",
+        "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-android.git",
+        "version": “3.6.4”
+    },
+    "ubuntu": {
+        "hostos": ["linux"],
+        "parser": "./metadata/ubuntu_parser",
+        "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-ubuntu.git",
+        "version": “3.6.3”
+    },
+    "amazon-fireos": {
+        "parser": "./metadata/amazon_fireos_parser",
+        "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-amazon-fireos.git",
+        "version": “3.6.3”
+    },
+    "wp8": {
+        "hostos": ["win32"],
+        "parser": "./metadata/wp8_parser",
+        "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-wp8.git",
+        "version": "b2b1e6185444e0dd6a6b9b19df9005cfc5bc5d80",
+        "altplatform": "wp",
+        "subdirectory": “3.6.4”
+    },
+    "blackberry10": {
+        "parser": "./metadata/blackberry10_parser",
+        "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-blackberry.git",
+        "version": “3.6.3”
+    },
+    "www": {
+        "hostos": [],
+        "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-app-hello-world.git",
+        "source": "git",
+        "version": "3.6.3"
+    },
+    "firefoxos": {
+        "parser": "./metadata/firefoxos_parser",
+        "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-firefoxos.git",
+        "version": “3.6.3”
+    },
+    "windows8": {
+        "hostos": ["win32"],
+        "parser": "./metadata/windows_parser",
+        "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-windows.git",
+        "version": "29457595f997a2900aa2eb9e67fdab6c674b061a",
+        "subdirectory": “3.6.4”
+    },
+    "windows": {
+        "hostos": ["win32"],
+        "parser": "./metadata/windows_parser",
+        "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-windows.git",
+        "version": "29457595f997a2900aa2eb9e67fdab6c674b061a",
+        "subdirectory": “3.6.4”
+    },
+    "browser": {
+        "parser": "./metadata/browser_parser",
+        "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-browser.git",
+        "version": “3.6.0”
+    }
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org