You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2014/09/03 03:40:33 UTC

[1/2] git commit: CB-7420 Windows. Plugin s are removed from platform during prepare

Repository: cordova-lib
Updated Branches:
  refs/heads/master c8d6abdf2 -> 165863134


CB-7420 Windows. Plugin <resource-file>s are removed from platform during prepare


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

Branch: refs/heads/master
Commit: 6e532116589939664fb9f063a5b15977a6c4eb99
Parents: 2ac042e
Author: sgrebnov <v-...@microsoft.com>
Authored: Thu Aug 28 16:23:42 2014 +0400
Committer: sgrebnov <v-...@microsoft.com>
Committed: Thu Aug 28 16:23:42 2014 +0400

----------------------------------------------------------------------
 cordova-lib/src/plugman/platforms/windows.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6e532116/cordova-lib/src/plugman/platforms/windows.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/windows.js b/cordova-lib/src/plugman/platforms/windows.js
index dc5089f..347e6a3 100644
--- a/cordova-lib/src/plugman/platforms/windows.js
+++ b/cordova-lib/src/plugman/platforms/windows.js
@@ -61,14 +61,14 @@ module.exports = {
     'source-file': {
         install:function(source_el, plugin_dir, project_dir, plugin_id, project_file) {
             var targetDir = source_el.attrib['target-dir'] || '';
-            var dest = path.join('www', 'plugins', plugin_id, targetDir, path.basename(source_el.attrib['src']));
+            var dest = path.join('plugins', plugin_id, targetDir, path.basename(source_el.attrib['src']));
 
             common.copyNewFile(plugin_dir, source_el.attrib['src'], project_dir, dest);
             // add reference to this file to jsproj.
             project_file.addSourceFile(dest);
         },
         uninstall:function(source_el, project_dir, plugin_id, project_file) {
-            var dest = path.join('www', 'plugins', plugin_id,
+            var dest = path.join('plugins', plugin_id,
                                  source_el.attrib['target-dir'] || '',
                                  path.basename(source_el.attrib['src']));
             common.removeFile(project_dir, dest);


[2/2] git commit: Merge branch 'CB-7420' of https://github.com/MSOpenTech/cordova-lib

Posted by pu...@apache.org.
Merge branch 'CB-7420' of https://github.com/MSOpenTech/cordova-lib


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

Branch: refs/heads/master
Commit: 165863134c31f4203c2bdbee6f5720baf48fee17
Parents: c8d6abd 6e53211
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Sep 2 18:40:16 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Sep 2 18:40:16 2014 -0700

----------------------------------------------------------------------
 cordova-lib/src/plugman/platforms/windows.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------