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 2015/03/03 08:37:44 UTC
[09/12] cordova-lib git commit: fixed merge conflict
fixed merge conflict
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/2f91b4fa
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/2f91b4fa
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/2f91b4fa
Branch: refs/heads/CB-8551
Commit: 2f91b4fa1635654c123147247a2eb04a460544ae
Parents: 38a0afb 608977d
Author: Steve Gill <st...@gmail.com>
Authored: Wed Feb 25 14:17:16 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Wed Feb 25 14:17:16 2015 -0800
----------------------------------------------------------------------
.gitignore | 2 +
cordova-lib/.jshintignore | 2 +
cordova-lib/package.json | 3 +-
cordova-lib/spec-cordova/HooksRunner.spec.js | 4 +-
cordova-lib/spec-cordova/prepare.spec.js | 1 +
cordova-lib/spec-cordova/restore.spec.js | 71 ---
cordova-lib/spec-cordova/save.spec.js | 67 ---
cordova-lib/spec-plugman/.jshintrc | 11 +
cordova-lib/spec-plugman/add_platform.spec.js | 16 +-
cordova-lib/spec-plugman/common.js | 2 +-
cordova-lib/spec-plugman/fetch.spec.js | 26 +-
.../spec-plugman/install-browserify.spec.js | 37 +-
cordova-lib/spec-plugman/install.spec.js | 32 +-
cordova-lib/spec-plugman/platform.spec.js | 8 +-
.../platforms/amazon-fireos.spec.js | 2 +
.../spec-plugman/platforms/android.spec.js | 237 ++++----
.../spec-plugman/platforms/blackberry10.spec.js | 10 +-
.../spec-plugman/platforms/common.spec.js | 21 +-
cordova-lib/spec-plugman/platforms/ios.spec.js | 80 ++-
.../spec-plugman/platforms/tizen.spec.js | 15 +-
.../spec-plugman/platforms/windows.spec.js | 419 ++++++++++++++
.../spec-plugman/platforms/windows8.spec.js | 140 -----
cordova-lib/spec-plugman/platforms/wp8.spec.js | 10 +-
.../org.test.plugins.dummyplugin/extra.gradle | 1 +
.../plugin-lib/AndroidManifest.xml | 5 +
.../plugin-lib/libFile | 1 +
.../plugin-lib/project.properties | 1 +
.../org.test.plugins.dummyplugin/plugin.xml | 25 +-
.../src/windows/dummer.js | 1 +
.../src/windows/dummy1.dll | 0
.../src/windows/dummy1.vcxproj | 7 +
.../src/windows/dummy2.dll | 0
.../src/windows/dummy2.vcxproj | 7 +
.../src/windows/dummy3.dll | 0
.../src/windows/dummy3.vcxproj | 7 +
.../src/windows/dummy4.dll | 0
.../src/windows/dummy4.vcxproj | 7 +
.../src/windows8/dummer.js | 1 -
.../org.test.plugins.faultyplugin/plugin.xml | 14 +-
.../src/windows/faultyPlugin.js | 1 +
.../src/windows8/faultyPlugin.js | 1 -
cordova-lib/spec-plugman/prepare.spec.js | 9 +-
.../projects/android_install/local.properties | 1 +
.../projects/android_one/project.properties | 4 +
.../projects/android_uninstall/local.properties | 1 +
.../SampleApp.xcodeproj/project.pbxproj | 44 +-
.../SampleApp.xcodeproj/project.pbxproj | 44 +-
.../projects/windows/CordovaApp.Phone.jsproj | 99 ++++
.../projects/windows/CordovaApp.Windows.jsproj | 99 ++++
.../windows/CordovaApp.Windows80.jsproj | 93 ++++
.../projects/windows/CordovaApp.projitems | 32 ++
.../projects/windows/CordovaApp.shproj | 30 +
.../projects/windows/CordovaApp.sln | 134 +++++
.../projects/windows/CordovaApp.vs2012.sln | 64 +++
.../windows/CordovaApp_TemporaryKey.pfx | Bin 0 -> 2544 bytes
.../spec-plugman/projects/windows/VERSION | 1 +
.../spec-plugman/projects/windows/config.xml | 14 +
.../projects/windows/package.phone.appxmanifest | 57 ++
.../windows/package.windows.appxmanifest | 58 ++
.../windows/package.windows80.appxmanifest | 50 ++
.../spec-plugman/registry/registry.spec.js | 4 +-
.../spec-plugman/uninstall-browserify.spec.js | 33 +-
cordova-lib/spec-plugman/uninstall.spec.js | 47 +-
.../spec-plugman/util/action-stack.spec.js | 3 +-
.../spec-plugman/util/config-changes.spec.js | 10 +-
cordova-lib/spec-plugman/util/csproj.spec.js | 13 +-
.../spec-plugman/util/dependencies.spec.js | 20 +-
cordova-lib/spec-plugman/util/plugins.spec.js | 6 +-
.../spec-plugman/util/xml-helpers.spec.js | 34 +-
cordova-lib/spec-plugman/wrappers.spec.js | 5 +-
cordova-lib/src/PluginInfo.js | 27 +-
cordova-lib/src/configparser/ConfigParser.js | 22 +-
cordova-lib/src/cordova/compile.js | 6 +-
cordova-lib/src/cordova/cordova.js | 2 -
.../src/cordova/metadata/firefoxos_parser.js | 40 ++
cordova-lib/src/cordova/platform.js | 74 ++-
cordova-lib/src/cordova/platformsConfig.json | 8 +-
cordova-lib/src/cordova/plugin.js | 114 +++-
cordova-lib/src/cordova/prepare.js | 30 +-
cordova-lib/src/cordova/restore-util.js | 110 ++++
cordova-lib/src/cordova/restore.js | 104 ----
cordova-lib/src/cordova/save.js | 161 ------
cordova-lib/src/cordova/util.js | 18 +-
cordova-lib/src/plugman/createpackagejson.js | 57 ++
cordova-lib/src/plugman/init-defaults.js | 141 +++++
cordova-lib/src/plugman/install.js | 30 +-
cordova-lib/src/plugman/platforms/android.js | 76 ++-
cordova-lib/src/plugman/platforms/ios.js | 21 +-
cordova-lib/src/plugman/platforms/windows.js | 52 +-
cordova-lib/src/plugman/plugman.js | 11 +-
cordova-lib/src/plugman/prepare.js | 2 +-
cordova-lib/src/plugman/registry/manifest.js | 2 +-
cordova-lib/src/plugman/registry/registry.js | 21 +-
cordova-lib/src/plugman/uninstall.js | 25 +-
cordova-lib/src/plugman/util/action-stack.js | 14 +-
cordova-lib/src/plugman/util/android-project.js | 150 ++---
cordova-lib/src/util/windows/jsproj.js | 309 -----------
cordova-lib/src/util/windows/jsprojManager.js | 544 +++++++++++++++++++
98 files changed, 2975 insertions(+), 1500 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/2f91b4fa/cordova-lib/package.json
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/2f91b4fa/cordova-lib/src/cordova/plugin.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/2f91b4fa/cordova-lib/src/plugman/registry/registry.js
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org