You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/10/07 13:57:54 UTC
[1/3] git commit: CB-7718 CB-7677 CordovaLib fails when installing
transitive dependencies
Repository: cordova-lib
Updated Branches:
refs/heads/master 457223806 -> 7ab3be8f5
CB-7718 CB-7677 CordovaLib fails when installing transitive dependencies
This closes #102
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/d62bf526
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/d62bf526
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/d62bf526
Branch: refs/heads/master
Commit: d62bf5260c33683d2394595cbbea6847d9a7ce28
Parents: 4572238
Author: sgrebnov <v-...@microsoft.com>
Authored: Tue Oct 7 11:52:25 2014 +0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Tue Oct 7 07:29:03 2014 -0400
----------------------------------------------------------------------
cordova-lib/src/plugman/install.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d62bf526/cordova-lib/src/plugman/install.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/install.js b/cordova-lib/src/plugman/install.js
index e11c30b..a9bd112 100644
--- a/cordova-lib/src/plugman/install.js
+++ b/cordova-lib/src/plugman/install.js
@@ -337,7 +337,7 @@ function runInstall(actions, platform, project_dir, plugin_dir, plugins_dir, opt
var hooksRunner = new HooksRunner(projectRoot);
- hooksRunner.fire('before_plugin_install', hookOptions).then(function() {
+ return hooksRunner.fire('before_plugin_install', hookOptions).then(function() {
return handleInstall(actions, pluginInfo, platform, project_dir, plugins_dir, install_plugin_dir, filtered_variables, options);
}).then(function(){
return hooksRunner.fire('after_plugin_install', hookOptions);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/3] git commit: CB-7670 Fixes failure when trying to fetch
dependent plugin while adding platform
Posted by ia...@apache.org.
CB-7670 Fixes failure when trying to fetch dependent plugin while adding platform
This closes #96
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/7ab3be8f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/7ab3be8f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/7ab3be8f
Branch: refs/heads/master
Commit: 7ab3be8f56d781017c7e19ae5ed3acb5cc9a8456
Parents: c08e8d2
Author: Vladimir Kotikov <v-...@microsoft.com>
Authored: Tue Sep 30 15:33:27 2014 +0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Tue Oct 7 07:30:21 2014 -0400
----------------------------------------------------------------------
cordova-lib/src/cordova/lazy_load.js | 14 +++++++++++++-
cordova-lib/src/plugman/registry/registry.js | 10 +++++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/7ab3be8f/cordova-lib/src/cordova/lazy_load.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/lazy_load.js b/cordova-lib/src/cordova/lazy_load.js
index 042d356..823ad04 100644
--- a/cordova-lib/src/cordova/lazy_load.js
+++ b/cordova-lib/src/cordova/lazy_load.js
@@ -136,7 +136,19 @@ function npm_cache_add(pkg) {
var npm_cache_dir = path.join(util.libDirectory, 'npm_cache');
// 'cache-min' is the time in seconds npm considers the files fresh and
// does not ask the registry if it got a fresher version.
- return Q.nfcall( npm.load, { 'cache-min': 3600*24, cache: npm_cache_dir })
+ var platformNpmConfig = {
+ 'cache-min': 3600*24,
+ cache: npm_cache_dir,
+ registry: 'https://registry.npmjs.org'
+ };
+
+ return Q.nfcall(npm.load)
+ .then(function () {
+ // configure npm here instead of passing parameters to npm.load due to CB-7670
+ for (var prop in platformNpmConfig) {
+ npm.config.set(prop, platformNpmConfig[prop]);
+ }
+ })
.then(function() {
return Q.ninvoke(npm.commands, 'cache', ['add', pkg]);
}).then(function(info) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/7ab3be8f/cordova-lib/src/plugman/registry/registry.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/registry/registry.js b/cordova-lib/src/plugman/registry/registry.js
index d74a572..db3dbaf 100644
--- a/cordova-lib/src/plugman/registry/registry.js
+++ b/cordova-lib/src/plugman/registry/registry.js
@@ -150,7 +150,15 @@ module.exports = {
fetch: function(plugin, client) {
plugin = plugin.shift();
return initSettings()
- .then(Q.nbind(npm.load, npm))
+ .then(function (settings) {
+ return Q.nfcall(npm.load)
+ // configure npm here instead of passing parameters to npm.load due to CB-7670
+ .then(function () {
+ for (var prop in settings){
+ npm.config.set(prop, settings[prop]);
+ }
+ });
+ })
.then(function() {
return Q.ninvoke(npm.commands, 'cache', ['add', plugin]);
})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/3] git commit: CB-7715 Fix windows build if folder has
'.(js|htm|etc)' in name
Posted by ia...@apache.org.
CB-7715 Fix windows build if folder has '.(js|htm|etc)' in name
This closes #99
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/c08e8d2c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/c08e8d2c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/c08e8d2c
Branch: refs/heads/master
Commit: c08e8d2c85309c58aa672388dbc7579d897eebed
Parents: d62bf52
Author: sgrebnov <v-...@microsoft.com>
Authored: Mon Oct 6 13:05:39 2014 +0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Tue Oct 7 07:29:59 2014 -0400
----------------------------------------------------------------------
cordova-lib/src/cordova/metadata/windows_parser.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/c08e8d2c/cordova-lib/src/cordova/metadata/windows_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/windows_parser.js b/cordova-lib/src/cordova/metadata/windows_parser.js
index a18c19b..a5ae98a 100644
--- a/cordova-lib/src/cordova/metadata/windows_parser.js
+++ b/cordova-lib/src/cordova/metadata/windows_parser.js
@@ -270,11 +270,16 @@ module.exports.prototype = {
var files = shell.ls('-R', www);
files.forEach(function (file) {
- if (!file.match(/\.(js|html|css|json)/)) {
+ if (!file.match(/\.(js|html|css|json)$/i)) {
return;
}
var filePath = path.join(www, file);
+ // skip if this is a folder
+ if (!fs.lstatSync(filePath).isFile()) {
+ return;
+ }
+
var content = fs.readFileSync(filePath);
if (content[0] !== 0xEF && content[1] !== 0xBE && content[2] !== 0xBB) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org