cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [5/8] git commit: stashing my changes
Date Fri, 21 Feb 2014 22:39:41 GMT
stashing my changes


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

Branch: refs/heads/master
Commit: ad2b3a7c90f07c5a5e701114aa8271f99d648fea
Parents: 98c9c5e 828f18d
Author: ignisvulpis <axel@nennker.de>
Authored: Fri Feb 21 21:44:17 2014 +0100
Committer: ignisvulpis <axel@nennker.de>
Committed: Fri Feb 21 21:44:17 2014 +0100

----------------------------------------------------------------------
 .npmignore                                    |    1 +
 README.md                                     |   29 +-
 RELEASENOTES.md                               |   35 +-
 doc/base.js                                   |    5 +
 doc/help.txt                                  |   33 +
 doc/platforms/android/android.xml             |   12 +
 doc/platforms/android/base.java               |   32 +
 doc/platforms/ios/base.m                      |   28 +
 doc/platforms/ios/ios.xml                     |    9 +
 main.js                                       |    5 +-
 package.json                                  |   16 +-
 plugman.js                                    |   53 +-
 spec/add_platform.spec.js                     |   64 ++
 spec/create.spec.js                           |   62 ++
 spec/install.spec.js                          |   10 +-
 spec/platforms/android.spec.js                |   17 +
 spec/platforms/ios.spec.js                    |    8 +-
 spec/plugins/DummyPlugin/android-resource.xml |    1 +
 spec/plugins/DummyPlugin/plugin.xml           |    2 +
 spec/uninstall.spec.js                        |    4 +-
 spec/util/config-changes.spec.js              |  129 +--
 spec/util/csproj.spec.js                      |    9 -
 spec/wrappers.spec.js                         |    2 +-
 src/create.js                                 |   81 ++
 src/fetch.js                                  |  158 +--
 src/install.js                                |  115 ++-
 src/platform.js                               |  119 +++
 src/platform_operation.js                     |    5 +
 src/platforms/amazon-fireos.js                |   11 +
 src/platforms/android.js                      |    6 +-
 src/platforms/blackberry10.js                 |    2 +-
 src/platforms/firefoxos.js                    |    2 +-
 src/platforms/ios.js                          |   34 +-
 src/platforms/windows8.js                     |   32 +-
 src/platforms/wp7.js                          |    2 +-
 src/platforms/wp8.js                          |   32 +-
 src/prepare.js                                |    4 +-
 src/registry/manifest.js                      |    4 +
 src/registry/registry.js                      |  115 ++-
 src/uninstall.js                              |    1 -
 src/util/config-changes.js                    | 1020 ++++++++++++--------
 src/util/csproj.js                            |  102 +-
 src/util/plist-helpers.js                     |    2 +-
 src/util/plugins.js                           |   15 -
 src/util/w8jsproj.js                          |   55 +-
 45 files changed, 1733 insertions(+), 750 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/ad2b3a7c/src/platforms/amazon-fireos.js
----------------------------------------------------------------------
diff --cc src/platforms/amazon-fireos.js
index c6cefd6,0574820..4fb89cb
--- a/src/platforms/amazon-fireos.js
+++ b/src/platforms/amazon-fireos.js
@@@ -58,9 -58,14 +58,20 @@@ module.exports = 
      },
      "resource-file":{
          install:function(el, plugin_dir, project_dir) {
++<<<<<<< HEAD
 +          require('../../plugman').emit('verbose', 'resource-file is not supported on this
platform');
 +        },
 +        uninstall:function(el, project_dir) {
++=======
+             var src = el.attrib.src;
+             var target = el.attrib.target;
+             require('../../plugman').emit('verbose', 'Copying resource file ' + src + '
to ' + target);
+             common.copyFile(plugin_dir, src, project_dir, target);
+         },
+         uninstall:function(el, project_dir) {
+             var target = el.attrib.target;
+             common.removeFile(project_dir, target);
++>>>>>>> upstream/master
          }
      }
  };


Mime
View raw message