cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [05/16] git commit: updating plugins manifest files to support config.xml
Date Wed, 03 Apr 2013 03:09:01 GMT
updating plugins manifest files to support config.xml


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

Branch: refs/heads/master
Commit: b490a0947cc557bcc9b72e542cbdc368ce2ba72e
Parents: 19bea13
Author: Anis Kadri <anis@apache.org>
Authored: Mon Apr 1 15:26:21 2013 -0700
Committer: Anis Kadri <anis@apache.org>
Committed: Mon Apr 1 15:26:21 2013 -0700

----------------------------------------------------------------------
 test/plugins/ChildBrowser/plugin-old.xml |   83 +++++++++++++++++++++++++
 test/plugins/ChildBrowser/plugin.xml     |   11 +++-
 test/plugins/DummyPlugin/plugin.xml      |    7 ++
 test/plugins/WebNotifications/plugin.xml |    2 +-
 test/plugins/WeblessPlugin/plugin.xml    |    7 ++
 5 files changed, 106 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b490a094/test/plugins/ChildBrowser/plugin-old.xml
----------------------------------------------------------------------
diff --git a/test/plugins/ChildBrowser/plugin-old.xml b/test/plugins/ChildBrowser/plugin-old.xml
new file mode 100644
index 0000000..a3d7643
--- /dev/null
+++ b/test/plugins/ChildBrowser/plugin-old.xml
@@ -0,0 +1,83 @@
+<?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://www.phonegap.com/ns/plugins/1.0"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    id="com.phonegap.plugins.childbrowser"
+    version="0.6.0">
+
+    <name>Child Browser</name>
+
+    <asset src="www/childbrowser.js" target="childbrowser.js" />
+    <asset src="www/childbrowser" target="childbrowser" />
+
+    <access origin="build.phonegap.com" />
+    <access origin="$APP_ID.s3.amazonaws.com" />
+
+    <!-- android -->
+    <platform name="android">
+        <config-file target="AndroidManifest.xml" parent="/manifest/application">
+            <activity android:name="com.phonegap.plugins.childBrowser.ChildBrowser"
+                      android:label="@string/app_name">
+                <intent-filter>
+                </intent-filter>
+            </activity>
+        </config-file>
+
+        <!-- CDV < 2.0 -->
+        <config-file target="res/xml/plugins.xml" parent="/plugins">
+            <plugin name="ChildBrowser"
+                value="com.phonegap.plugins.childBrowser.ChildBrowser"/>
+        </config-file>
+
+        <!-- CDV 2.0+ (for now) -->
+        <config-file target="res/xml/config.xml" parent="/cordova/plugins">
+            <plugin name="ChildBrowser"
+                value="com.phonegap.plugins.childBrowser.ChildBrowser"/>
+        </config-file>
+
+        <source-file src="ChildBrowser.java"
+                target-dir="src/com/phonegap/plugins/childBrowser" />
+    </platform>
+
+    <!-- ios -->
+    <platform name="ios">
+        <plugins-plist key="com.phonegap.plugins.childbrowser"
+            string="ChildBrowserCommand" />
+
+        <resource-file src="ChildBrowser.bundle" />
+        <resource-file src="ChildBrowserViewController.xib" />
+
+        <header-file src="ChildBrowserCommand.h" />
+        <header-file src="ChildBrowserViewController.h" />
+        <header-file src="preserveDirs/PreserveDirsTest.h" preserve-dirs="true" />
+        <header-file src="TargetDirTest.h" target-dir="targetDir"/>
+
+        <source-file src="ChildBrowserCommand.m" />
+        <source-file src="ChildBrowserViewController.m" />
+        <source-file src="preserveDirs/PreserveDirsTest.m" preserve-dirs="true" />
+        <header-file src="TargetDirTest.m" target-dir="targetDir"/>
+
+        <!-- framework for testing (not actual dependency of ChildBrowser -->
+        <framework src="libsqlite3.dylib" />
+        <framework src="social.framework" weak="true" />
+        <framework src="music.framework" weak="rabbit" />
+    </platform>
+</plugin>

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b490a094/test/plugins/ChildBrowser/plugin.xml
----------------------------------------------------------------------
diff --git a/test/plugins/ChildBrowser/plugin.xml b/test/plugins/ChildBrowser/plugin.xml
index afd4d0b..37ed744 100644
--- a/test/plugins/ChildBrowser/plugin.xml
+++ b/test/plugins/ChildBrowser/plugin.xml
@@ -28,9 +28,9 @@
     <asset src="www/childbrowser.js" target="childbrowser.js" />
     <asset src="www/childbrowser" target="childbrowser" />
 
-	  <access origin="build.phonegap.com" />
-	  <access origin="$APP_ID.s3.amazonaws.com" />
-	
+    <access origin="build.phonegap.com" />
+    <access origin="$APP_ID.s3.amazonaws.com" />
+
     <!-- android -->
     <platform name="android">
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
@@ -62,6 +62,11 @@
         <plugins-plist key="com.phonegap.plugins.childbrowser"
             string="ChildBrowserCommand" />
 
+        <config-file target="config.xml" parent="/widget/plugins">
+            <plugin name="ChildBrowser"
+                value="ChildBrowserCommand" />
+        </config-file>
+
         <resource-file src="ChildBrowser.bundle" />
         <resource-file src="ChildBrowserViewController.xib" />
 

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b490a094/test/plugins/DummyPlugin/plugin.xml
----------------------------------------------------------------------
diff --git a/test/plugins/DummyPlugin/plugin.xml b/test/plugins/DummyPlugin/plugin.xml
index 7ca1982..01fd83b 100644
--- a/test/plugins/DummyPlugin/plugin.xml
+++ b/test/plugins/DummyPlugin/plugin.xml
@@ -71,8 +71,15 @@
         
     <!-- 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"
+                value="DummyPluginCommand"/>
+        </config-file>
 
         <resource-file src="DummyPlugin.bundle" />
         <resource-file src="DummyPluginViewController.xib" />

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b490a094/test/plugins/WebNotifications/plugin.xml
----------------------------------------------------------------------
diff --git a/test/plugins/WebNotifications/plugin.xml b/test/plugins/WebNotifications/plugin.xml
index 844d09c..788173b 100644
--- a/test/plugins/WebNotifications/plugin.xml
+++ b/test/plugins/WebNotifications/plugin.xml
@@ -32,7 +32,7 @@
 	
     <!-- ios -->
     <platform name="ios">
-        <config-file target="config.xml" parent="/cordova/plugins">
+        <config-file target="config.xml" parent="/widget/plugins">
             <plugin name="WebNotifications"
                 value="WebNotifications"/>
         </config-file>

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b490a094/test/plugins/WeblessPlugin/plugin.xml
----------------------------------------------------------------------
diff --git a/test/plugins/WeblessPlugin/plugin.xml b/test/plugins/WeblessPlugin/plugin.xml
index 72eb3d8..d0f3bd9 100644
--- a/test/plugins/WeblessPlugin/plugin.xml
+++ b/test/plugins/WeblessPlugin/plugin.xml
@@ -56,8 +56,15 @@
 
     <!-- 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">
+            <plugin name="WeblessPlugin"
+                value="WeblessPluginCommand"/>
+        </config-file>
 
         <resource-file src="WeblessPlugin.bundle" />
         <resource-file src="WeblessPluginViewController.xib" />


Mime
View raw message