You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ka...@apache.org on 2014/05/09 17:29:39 UTC
git commit: CB-4456: Remove plugins-plist bits from the tests
Repository: cordova-lib
Updated Branches:
refs/heads/master efecd10ed -> 3e468db64
CB-4456: Remove plugins-plist bits from the tests
Support for plugins-plist was removed as of 3.4 in Feb 2014. It was replaced
with a deprecation warning. This change is for removal of plugins-plist
related bits in the tests.
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/3e468db6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/3e468db6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/3e468db6
Branch: refs/heads/master
Commit: 3e468db64c480a446884849586d7686b1bc2e6bf
Parents: efecd10
Author: Mark Koudritsky <ka...@gmail.com>
Authored: Fri May 9 11:27:04 2014 -0400
Committer: Mark Koudritsky <ka...@gmail.com>
Committed: Fri May 9 11:27:04 2014 -0400
----------------------------------------------------------------------
cordova-lib/spec-plugman/platforms/ios.spec.js | 10 -------
.../plugins/ChildBrowser/plugin.xml | 15 ++++------
.../spec-plugman/plugins/DummyPlugin/plugin.xml | 10 ++-----
.../plugins/PluginsPlistOnly/plugin.xml | 31 --------------------
.../plugins/WeblessPlugin/plugin.xml | 5 +---
5 files changed, 10 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3e468db6/cordova-lib/spec-plugman/platforms/ios.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/ios.spec.js b/cordova-lib/spec-plugman/platforms/ios.spec.js
index 5bb1637..9243827 100644
--- a/cordova-lib/spec-plugman/platforms/ios.spec.js
+++ b/cordova-lib/spec-plugman/platforms/ios.spec.js
@@ -17,7 +17,6 @@ var ios = require('../../src/plugman/platforms/ios'),
xml_helpers = require('../../src/util/xml-helpers'),
variableplugin = path.join(__dirname, '..', 'plugins', 'VariablePlugin'),
faultyplugin = path.join(__dirname, '..', 'plugins', 'FaultyPlugin'),
- plistplugin = path.join(__dirname, '..', 'plugins', 'PluginsPlistOnly'),
dummyplugin = path.join(__dirname, '..', 'plugins', 'DummyPlugin');
var xml_path = path.join(dummyplugin, 'plugin.xml'),
@@ -32,7 +31,6 @@ var valid_source = platformTag.findall('./source-file'),
valid_resources = platformTag.findall('./resource-file'),
valid_custom_frameworks = platformTag.findall('./framework[@custom="true"]'),
valid_frameworks = platformTag.findall('./framework'),
- plist_els = platformTag.findall('./plugins-plist'),
dummy_configs = platformTag.findall('./config-file');
xml_path = path.join(variableplugin, 'plugin.xml');
@@ -56,14 +54,6 @@ var invalid_resources = platformTag.findall('./resource-file');
var invalid_custom_frameworks = platformTag.findall('./framework[@custom="true"]');
var invalid_frameworks = platformTag.findall('./framework');
-xml_path = path.join(plistplugin, 'plugin.xml');
-xml_test = fs.readFileSync(xml_path, 'utf-8');
-plugin_et = new et.ElementTree(et.XML(xml_test));
-platformTag = plugin_et.find('./platform[@name="ios"]');
-
-var plist_id = plugin_et._root.attrib['id'];
-var plist_only_els = platformTag.findall('./plugins-plist');
-
shell.mkdir('-p', temp);
shell.cp('-rf', ios_config_xml_project, temp);
var proj_files = ios.parseProjectFile(temp);
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3e468db6/cordova-lib/spec-plugman/plugins/ChildBrowser/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/plugins/ChildBrowser/plugin.xml b/cordova-lib/spec-plugman/plugins/ChildBrowser/plugin.xml
index 2dfd692..77809f2 100644
--- a/cordova-lib/spec-plugman/plugins/ChildBrowser/plugin.xml
+++ b/cordova-lib/spec-plugman/plugins/ChildBrowser/plugin.xml
@@ -36,7 +36,7 @@
<access origin="build.phonegap.com" />
<access origin="s3.amazonaws.com" />
</config-file>
-
+
<info>No matter what platform you are installing to, this notice is very important.</info>
<!-- android -->
@@ -68,9 +68,6 @@
<!-- ios -->
<platform name="ios">
- <plugins-plist key="com.phonegap.plugins.childbrowser"
- string="ChildBrowserCommand" />
-
<config-file target="config.xml" parent="/widget/plugins">
<plugin name="ChildBrowser"
value="ChildBrowserCommand" />
@@ -82,7 +79,7 @@
<config-file target="*-Info.plist" parent="AppId">
<string>$APP_ID</string>
</config-file>
-
+
<config-file target="*-Info.plist" parent="CFBundleURLTypes">
<array>
<dict>
@@ -119,8 +116,8 @@
target-dir="Plugins\" />
<!-- modify the project file to include the added files -->
- <config-file target=".csproj" parent=".">
- </config-file>
+ <config-file target=".csproj" parent=".">
+ </config-file>
</platform>
@@ -136,8 +133,8 @@
target-dir="Plugins\" />
<!-- modify the project file to include the added files -->
- <config-file target=".csproj" parent=".">
- </config-file>
+ <config-file target=".csproj" parent=".">
+ </config-file>
</platform>
</plugin>
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3e468db6/cordova-lib/spec-plugman/plugins/DummyPlugin/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/plugins/DummyPlugin/plugin.xml b/cordova-lib/spec-plugman/plugins/DummyPlugin/plugin.xml
index 4733afb..e3d7097 100644
--- a/cordova-lib/spec-plugman/plugins/DummyPlugin/plugin.xml
+++ b/cordova-lib/spec-plugman/plugins/DummyPlugin/plugin.xml
@@ -27,7 +27,7 @@
<name>dummyplugin</name>
<!-- These are going to be required by plugman-registry -->
<description>my description</description>
- <author>Jackson Badman</author>
+ <author>Jackson Badman</author>
<keywords>dummy,plugin</keywords>
<license>BSD</license>
<!-- end plugman-registry requirements -->
@@ -68,7 +68,7 @@
target-dir="src/com/phonegap/plugins/dummyplugin" />
<lib-file src="src/android/TestLib.jar" />
</platform>
-
+
<!-- amazon fireos -->
<platform name="amazon-fireos">
<config-file target="AndroidManifest.xml" parent="/manifest/application">
@@ -108,13 +108,9 @@
</js-module>
</platform>
-
+
<!-- ios -->
<platform name="ios">
- <!-- CDV < 2.4 -->
- <plugins-plist key="com.phonegap.plugins.dummyplugin"
- string="DummyPluginCommand" />
-
<!-- CDV 2.5+ -->
<config-file target="config.xml" parent="/widget/plugins">
<plugin name="DummyPlugin"
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3e468db6/cordova-lib/spec-plugman/plugins/PluginsPlistOnly/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/plugins/PluginsPlistOnly/plugin.xml b/cordova-lib/spec-plugman/plugins/PluginsPlistOnly/plugin.xml
deleted file mode 100644
index 0e00504..0000000
--- a/cordova-lib/spec-plugman/plugins/PluginsPlistOnly/plugin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2013 Anis Kadri
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
- id="com.phonegap.plugins.oldskewl"
- version="0.0.1">
-
- <name>Old Skewl Plugin using Plists</name>
-
- <!-- ios -->
- <platform name="ios">
- <plugins-plist key="OldSkewl" string="OldSkewlCommand" />
- </platform>
-</plugin>
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3e468db6/cordova-lib/spec-plugman/plugins/WeblessPlugin/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/plugins/WeblessPlugin/plugin.xml b/cordova-lib/spec-plugman/plugins/WeblessPlugin/plugin.xml
index 5522d22..f919096 100644
--- a/cordova-lib/spec-plugman/plugins/WeblessPlugin/plugin.xml
+++ b/cordova-lib/spec-plugman/plugins/WeblessPlugin/plugin.xml
@@ -29,7 +29,7 @@
<access origin="build.phonegap.com" />
<access origin="s3.amazonaws.com" />
</config-file>
-
+
<!-- android -->
<platform name="android">
<config-file target="AndroidManifest.xml" parent="/manifest/application">
@@ -58,9 +58,6 @@
<!-- ios -->
<platform name="ios">
- <!-- CDV < 2.4 -->
- <plugins-plist key="com.phonegap.plugins.weblessplugin"
- string="WeblessPluginCommand" />
<!-- CDV 2.4 had a /cordova/plugins instead of /widget/plugins so ignored! -->
<!-- CDV 2.5+ -->
<config-file target="config.xml" parent="/widget/plugins">