You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/04/24 23:13:59 UTC
[01/28] git commit: adding browserify and through as dependencies
Repository: cordova-plugman
Updated Branches:
refs/heads/master 8aca4cb5b -> 013adc61c
adding browserify and through as dependencies
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/910dc7be
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/910dc7be
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/910dc7be
Branch: refs/heads/master
Commit: 910dc7be6b6ede8f253f2791be4e0b751b8a68e3
Parents: cc51a5f
Author: Anis Kadri <an...@apache.org>
Authored: Wed Mar 5 16:24:38 2014 -0800
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Mar 5 16:24:38 2014 -0800
----------------------------------------------------------------------
package.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/910dc7be/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 5ddf316..5410416 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,9 @@
"npm": "1.3.4",
"rc": "0.3.0",
"tar": "0.1.x",
- "request": "2.22.0"
+ "request": "2.22.0",
+ "browserify": "3.2.0",
+ "through": "2.3.4"
},
"devDependencies": {
"jasmine-node": "1.7.0",
[18/28] git commit: fixing path
Posted by an...@apache.org.
fixing path
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/149d1ecc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/149d1ecc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/149d1ecc
Branch: refs/heads/master
Commit: 149d1ecc8fe5f7356682e0293269ec4a939ecbc6
Parents: 8229393
Author: Anis Kadri <an...@apache.org>
Authored: Tue Mar 18 17:35:27 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:45:01 2014 -0700
----------------------------------------------------------------------
package.json | 2 --
src/prepare.js | 18 +++++++++++++-----
2 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/149d1ecc/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 60953f1..c18faba 100644
--- a/package.json
+++ b/package.json
@@ -32,8 +32,6 @@
"rc": "0.3.0",
"tar": "0.1.x",
"request": "2.22.0",
- "browserify": "3.2.0",
- "through": "2.3.4",
"cordova-js": "3.x.x"
},
"devDependencies": {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/149d1ecc/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 3b2fbb5..af18877 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -32,6 +32,7 @@ var platform_modules = require('./platforms'),
util = require('util'),
plugman = require('../plugman'),
et = require('elementtree'),
+ bundle = require('cordova-js/tasks/lib/bundle-browserify'),
writeLicenseHeader = require('cordova-js/tasks/lib/write-license-header');
// Called on --prepare.
@@ -240,19 +241,26 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
}
/* begin browserify */
- var outReleaseFile = path.join('pkg', 'cordova.' + platform + '.js');
+ var outReleaseFile = path.join(wwwDir, 'cordova-b.js');
var outReleaseFileStream = fs.createWriteStream(outReleaseFile);
var commitId = 'N/A';
-
+ var newTime = null;
+
writeLicenseHeader(outReleaseFileStream, platform, commitId);
-
+
releaseBundle = libraryRelease.bundle();
releaseBundle.pipe(outReleaseFileStream);
releaseBundle.on('end', function() {
- var newtime = new Date().valueOf() - time;
+ console.log('end');
+ newtime = new Date().valueOf() - time;
plugman.emit('verbose', 'generated cordova.' + platform + '.js @ ' + commitId + ' in ' + newtime + 'ms');
});
- /* end browserify */
+
+ releaseBundle.on('error', function(err) {
+ newtime = new Date().valueOf() - time;
+ console.log('error while generating cordova.js');
+ plugman.emit('verbose', 'error while generating cordova.js');
+ });
};
[11/28] git commit: adding message to exception
Posted by an...@apache.org.
adding message to exception
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/7d85eaad
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/7d85eaad
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/7d85eaad
Branch: refs/heads/master
Commit: 7d85eaad5644374caf8fea3475616e15dfb76927
Parents: 909aa10
Author: Anis Kadri <an...@apache.org>
Authored: Wed Apr 9 16:24:51 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Apr 9 16:24:51 2014 -0700
----------------------------------------------------------------------
main.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/7d85eaad/main.js
----------------------------------------------------------------------
diff --git a/main.js b/main.js
index cb08923..68273fd 100755
--- a/main.js
+++ b/main.js
@@ -54,7 +54,7 @@ if (cli_opts.plugins_dir || cli_opts.project) {
process.on('uncaughtException', function(error) {
if (cli_opts.debug) {
- console.error(error.stack);
+ console.error(error.message, error.stack);
} else {
console.error(error.message);
}
[06/28] git commit: setting finish event on outputstream
Posted by an...@apache.org.
setting finish event on outputstream
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/57bba0d3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/57bba0d3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/57bba0d3
Branch: refs/heads/master
Commit: 57bba0d312b9111b6d5a993d7e54854869bbd09c
Parents: 14df7fd
Author: Anis Kadri <an...@apache.org>
Authored: Wed Mar 26 17:44:21 2014 +0100
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Mar 26 17:44:21 2014 +0100
----------------------------------------------------------------------
src/prepare.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/57bba0d3/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 1ba69a5..fd12d34 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -254,12 +254,12 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
releaseBundle.pipe(outReleaseFileStream);
- releaseBundle.on('end', function() {
+ outReleaseFileStream.on('finish', function() {
var newtime = new Date().valueOf() - time;
plugman.emit('verbose', 'generated cordova.' + platform + '.js @ ' + commitId + ' in ' + newtime + 'ms');
});
- releaseBundle.on('error', function(err) {
+ outReleaseFileStream.on('error', function(err) {
var newtime = new Date().valueOf() - time;
console.log('error while generating cordova_b.js');
plugman.emit('verbose', 'error while generating cordova.js');
[10/28] git commit: removing window from target
Posted by an...@apache.org.
removing window from target
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/909aa103
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/909aa103
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/909aa103
Branch: refs/heads/master
Commit: 909aa103a8c4a5b4d5cca5a6690fb573d1d41d29
Parents: 6387e61
Author: Anis Kadri <an...@apache.org>
Authored: Tue Apr 8 18:55:23 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Apr 8 18:55:23 2014 -0700
----------------------------------------------------------------------
src/util/prepare-namespace.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/909aa103/src/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/src/util/prepare-namespace.js b/src/util/prepare-namespace.js
index 3c19d13..2cb9560 100644
--- a/src/util/prepare-namespace.js
+++ b/src/util/prepare-namespace.js
@@ -1,5 +1,8 @@
// FIXME this is extremely guettho
module.exports = function(target, method) {
+
+ target = target.replace(/^window(\.)?/, '');
+
var lastDot = target.lastIndexOf('.');
var namespace = target.substr(0, lastDot);
var lastName = target.substr(lastDot + 1);
[03/28] git commit: adding browserify bundle
Posted by an...@apache.org.
adding browserify bundle
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/eb4bc45b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/eb4bc45b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/eb4bc45b
Branch: refs/heads/master
Commit: eb4bc45be64876ced36bd0e2b500fa968c0ca5fc
Parents: 497af4d
Author: Anis Kadri <an...@apache.org>
Authored: Mon Mar 17 14:52:10 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Mon Mar 17 14:52:10 2014 -0700
----------------------------------------------------------------------
src/prepare.js | 60 +++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 44 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/eb4bc45b/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 46e9487..e946cfb 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -19,19 +19,21 @@
/* jshint node:true */
-var platform_modules = require('./platforms'),
- path = require('path'),
- config_changes = require('./util/config-changes'),
- xml_helpers = require('./util/xml-helpers'),
- wp7 = require('./platforms/wp7'),
- wp8 = require('./platforms/wp8'),
- windows8 = require('./platforms/windows8'),
- common = require('./platforms/common');
- fs = require('fs'),
- shell = require('shelljs'),
- util = require('util'),
- plugman = require('../plugman'),
- et = require('elementtree');
+var platform_modules = require('./platforms'),
+ path = require('path'),
+ config_changes = require('./util/config-changes'),
+ xml_helpers = require('./util/xml-helpers'),
+ wp7 = require('./platforms/wp7'),
+ wp8 = require('./platforms/wp8'),
+ windows8 = require('./platforms/windows8'),
+ common = require('./platforms/common');
+ fs = require('fs'),
+ shell = require('shelljs'),
+ util = require('util'),
+ plugman = require('../plugman'),
+ et = require('elementtree'),
+// bundle = require('cordova-js/tasks/lib/bundle-browserify');
+// writeLicenseHeader = require('cordova-js/tasks/lib/write-license-header');
// Called on --prepare.
// Sets up each plugin's Javascript code to be loaded properly.
@@ -117,6 +119,10 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
}
}
+
+ /* begin browserify */
+ var libraryRelease = bundle(platform, false, 'N/A');
+ /* end browserify */
platform_json = config_changes.get_platform_json(plugins_dir, platform);
// This array holds all the metadata for each module and ends up in cordova_plugins.json
@@ -174,12 +180,17 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
if (module.attrib.name) {
moduleName += module.attrib.name;
} else {
- var result = module.attrib.src.match(/([^\/]+)\.js/);
- moduleName += result[1];
+ // var result = module.attrib.src.match(/([^\/]+)\.js/);
+ // moduleName += result[1];
+ moduleName = path.basename(module.attrib.src, '.js');
}
var fsPath = path.join.apply(path, pathParts);
- var scriptContent = fs.readFileSync(path.join(pluginDir, fsPath), 'utf-8');
+ var scriptPath = path.join(pluginDir, fsPath);
+
+ libraryRelease.add(fsPath);
+
+ var scriptContent = fs.readFileSync(scriptPath, 'utf-8');
scriptContent = 'cordova.define("' + moduleName + '", function(require, exports, module) { ' + scriptContent + '\n});\n';
fs.writeFileSync(path.join(platformPluginsDir, plugin_id, fsPath), scriptContent, 'utf-8');
if(platform == 'wp7' || platform == 'wp8' || platform == "windows8") {
@@ -230,4 +241,21 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
wp_csproj.addSourceFile(path.join('www', 'cordova_plugins.js'));
wp_csproj.write();
}
+
+ /* begin browserify */
+ var outReleaseFile = path.join('pkg', 'cordova.' + platform + '.js');
+ var outReleaseFileStream = fs.createWriteStream(outReleaseFile);
+ var commitId = 'N/A';
+
+ writeLicenseHeader(outReleaseFileStream, platform, commitId);
+
+ releaseBundle = libraryRelease.bundle();
+
+ releaseBundle.pipe(outReleaseFileStream);
+
+ releaseBundle.on('end', function() {
+ var newtime = new Date().valueOf() - time;
+ plugman.emit('verbose', 'generated cordova.' + platform + '.js @ ' + commitId + ' in ' + newtime + 'ms');
+ });
+ /* end browserify */
};
[19/28] git commit: setting finish event on outputstream
Posted by an...@apache.org.
setting finish event on outputstream
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/781ec241
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/781ec241
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/781ec241
Branch: refs/heads/master
Commit: 781ec24101b3c7f241d160142a300853ea279daa
Parents: b7bf810
Author: Anis Kadri <an...@apache.org>
Authored: Wed Mar 26 17:44:21 2014 +0100
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:45:01 2014 -0700
----------------------------------------------------------------------
src/prepare.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/781ec241/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 5510d76..6fe2fe1 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -252,12 +252,12 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
releaseBundle.pipe(outReleaseFileStream);
- releaseBundle.on('end', function() {
+ outReleaseFileStream.on('finish', function() {
var newtime = new Date().valueOf() - time;
plugman.emit('verbose', 'generated cordova.' + platform + '.js @ ' + commitId + ' in ' + newtime + 'ms');
});
- releaseBundle.on('error', function(err) {
+ outReleaseFileStream.on('error', function(err) {
var newtime = new Date().valueOf() - time;
console.log('error while generating cordova_b.js');
plugman.emit('verbose', 'error while generating cordova.js');
[09/28] git commit: adding prepare namespace
Posted by an...@apache.org.
adding prepare namespace
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/6387e611
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/6387e611
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/6387e611
Branch: refs/heads/master
Commit: 6387e611fe3e2b8be2ff906306e70d5331c3bf89
Parents: 4146171
Author: Anis Kadri <an...@apache.org>
Authored: Tue Apr 8 18:37:27 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Apr 8 18:37:27 2014 -0700
----------------------------------------------------------------------
src/prepare.js | 14 ++++----------
src/util/prepare-namespace.js | 31 +++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/6387e611/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index d8fc634..85be55a 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -23,6 +23,7 @@ var platform_modules = require('./platforms'),
path = require('path'),
config_changes = require('./util/config-changes'),
xml_helpers = require('./util/xml-helpers'),
+ prepareNamespace = require('./util/prepare-namespace'),
wp7 = require('./platforms/wp7'),
wp8 = require('./platforms/wp8'),
windows8 = require('./platforms/windows8'),
@@ -217,14 +218,10 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
obj.clobbers = [];
}
obj.clobbers.push(child.attrib.target);
- /* FIXME: browserify guettho clobber */
+ //console.log(prepareNamespace(child.attrib.target, 'c'));
fs.appendFileSync(bScriptPath,
- util.format(
- "require('cordova/builder').assignOrWrapInDeprecateGetter(window, '%s', module.exports);",
- child.attrib.target
- ),
+ prepareNamespace(child.attrib.target, 'c'),
'utf-8');
- /* end browserify guettho clobber */
} else if (child.tag.toLowerCase() == 'merges') {
if (!obj.merges) {
obj.merges = [];
@@ -232,10 +229,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
obj.merges.push(child.attrib.target);
/* FIXME: browserify guettho clobber */
fs.appendFileSync(bScriptPath,
- util.format(
- "require('cordova/builder').recursiveMerge(window, '%s', module.exports);",
- child.attrib.target
- ),
+ prepareNamespace(child.attrib.target, 'm'),
'utf-8');
/* end browserify guettho clobber */
} else if (child.tag.toLowerCase() == 'runs') {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/6387e611/src/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/src/util/prepare-namespace.js b/src/util/prepare-namespace.js
new file mode 100644
index 0000000..3c19d13
--- /dev/null
+++ b/src/util/prepare-namespace.js
@@ -0,0 +1,31 @@
+// FIXME this is extremely guettho
+module.exports = function(target, method) {
+ var lastDot = target.lastIndexOf('.');
+ var namespace = target.substr(0, lastDot);
+ var lastName = target.substr(lastDot + 1);
+ var props = target.split(".");
+ var code = "";
+ for(var i = 1, len = props.length ; i <= len ; i++) {
+ var sub = props.slice(0, i).join(".");
+ code += util.format("window.%s = window.%s || {};\n", sub, sub);
+ }
+
+ props.unshift('window');
+ var object = props.slice(0, props.length - 1).join('.');
+// code = "\n";
+ if(method === "c") {
+ return util.format(
+ "%s\n;require('cordova/builder').assignOrWrapInDeprecateGetter(%s, '%s', module.exports);",
+ code,
+ object,
+ lastName
+ );
+ } else if(method === "m") {
+ return util.format(
+ "%s\n;require('cordova/builder').recursiveMerge(%s, '%s', module.exports);",
+ code,
+ object,
+ lastName
+ );
+ }
+}
[08/28] git commit: creating a transform for org.apache.cordova.*
modules
Posted by an...@apache.org.
creating a transform for org.apache.cordova.* modules
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/4146171f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/4146171f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/4146171f
Branch: refs/heads/master
Commit: 4146171ff53300a058df198dbfbe436ae820ea76
Parents: cd13a49
Author: Anis Kadri <an...@apache.org>
Authored: Sat Mar 29 21:16:47 2014 +0100
Committer: Anis Kadri <an...@apache.org>
Committed: Sat Mar 29 21:16:47 2014 +0100
----------------------------------------------------------------------
src/prepare.js | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/4146171f/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 5c6b694..d8fc634 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -32,7 +32,8 @@ var platform_modules = require('./platforms'),
util = require('util'),
plugman = require('../plugman'),
et = require('elementtree'),
- bundle = require('cordova-js/tasks/lib/bundle-browserify');
+ bundle = require('cordova-js/tasks/lib/bundle-browserify'),
+ requireTr = require('cordova-js/tasks/lib/require-tr'),
writeLicenseHeader = require('cordova-js/tasks/lib/write-license-header');
// Called on --prepare.
@@ -121,6 +122,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
}
/* begin browserify */
+ requireTr.platform = platform;
var libraryRelease = bundle(platform, false, 'N/A');
/* end browserify */
@@ -187,7 +189,11 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
var fsPath = path.join.apply(path, pathParts);
var scriptPath = path.join(pluginDir, fsPath);
+
+ /* begin browserify */
var bScriptPath = util.format("%s.%s", scriptPath, 'browserify');
+ requireTr.addModule({symbol: new RegExp(moduleName), path: bScriptPath});
+ /* end browserify */
var scriptContent = fs.readFileSync(scriptPath, 'utf-8');
fs.writeFileSync(bScriptPath, scriptContent, 'utf-8');
@@ -239,7 +245,10 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
// Add it to the list of module objects bound for cordova_plugins.json
moduleObjects.push(obj);
+ /* begin browserify */
+ libraryRelease.transform(requireTr.transform);
libraryRelease.add(bScriptPath);
+ /* end browserify */
});
});
@@ -275,6 +284,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
outReleaseFileStream.on('finish', function() {
var newtime = new Date().valueOf() - time;
plugman.emit('verbose', 'generated cordova.' + platform + '.js @ ' + commitId + ' in ' + newtime + 'ms');
+ // TODO clean up all the *.browserify files
});
outReleaseFileStream.on('error', function(err) {
@@ -282,4 +292,5 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
console.log('error while generating cordova_b.js');
plugman.emit('verbose', 'error while generating cordova.js');
});
+ /* end browserify */
};
[05/28] git commit: cleanup
Posted by an...@apache.org.
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/14df7fd4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/14df7fd4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/14df7fd4
Branch: refs/heads/master
Commit: 14df7fd4ea2953cd5712031a3b1e54c8371a75ca
Parents: 03bc66c
Author: Anis Kadri <an...@apache.org>
Authored: Tue Mar 18 17:48:03 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Mar 18 17:48:03 2014 -0700
----------------------------------------------------------------------
src/prepare.js | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/14df7fd4/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 60e8c64..1ba69a5 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -188,7 +188,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
var fsPath = path.join.apply(path, pathParts);
var scriptPath = path.join(pluginDir, fsPath);
- libraryRelease.add(fsPath);
+ libraryRelease.add(scriptPath);
var scriptContent = fs.readFileSync(scriptPath, 'utf-8');
scriptContent = 'cordova.define("' + moduleName + '", function(require, exports, module) { ' + scriptContent + '\n});\n';
@@ -246,7 +246,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
var outReleaseFile = path.join(wwwDir, 'cordova-b.js');
var outReleaseFileStream = fs.createWriteStream(outReleaseFile);
var commitId = 'N/A';
- var newTime = null;
+ var time = new Date().valueOf();
writeLicenseHeader(outReleaseFileStream, platform, commitId);
@@ -255,14 +255,13 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
releaseBundle.pipe(outReleaseFileStream);
releaseBundle.on('end', function() {
- console.log('end');
- newtime = new Date().valueOf() - time;
+ var newtime = new Date().valueOf() - time;
plugman.emit('verbose', 'generated cordova.' + platform + '.js @ ' + commitId + ' in ' + newtime + 'ms');
});
releaseBundle.on('error', function(err) {
- newtime = new Date().valueOf() - time;
- console.log('error while generating cordova.js');
+ var newtime = new Date().valueOf() - time;
+ console.log('error while generating cordova_b.js');
plugman.emit('verbose', 'error while generating cordova.js');
});
};
[24/28] git commit: creating a transform for org.apache.cordova.*
modules
Posted by an...@apache.org.
creating a transform for org.apache.cordova.* modules
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/89c2dadb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/89c2dadb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/89c2dadb
Branch: refs/heads/master
Commit: 89c2dadb442d0bccf04597f7a9b016693ca1dbe0
Parents: ef1b980
Author: Anis Kadri <an...@apache.org>
Authored: Sat Mar 29 21:16:47 2014 +0100
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:45:45 2014 -0700
----------------------------------------------------------------------
src/prepare.js | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/89c2dadb/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 8b770e1..ae7f500 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -33,6 +33,7 @@ var platform_modules = require('./platforms'),
plugman = require('../plugman'),
et = require('elementtree'),
bundle = require('cordova-js/tasks/lib/bundle-browserify'),
+ requireTr = require('cordova-js/tasks/lib/require-tr'),
writeLicenseHeader = require('cordova-js/tasks/lib/write-license-header');
// Called on --prepare.
@@ -119,6 +120,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
}
/* begin browserify */
+ requireTr.platform = platform;
var libraryRelease = bundle(platform, false, 'N/A');
/* end browserify */
@@ -185,7 +187,11 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
var fsPath = path.join.apply(path, pathParts);
var scriptPath = path.join(pluginDir, fsPath);
+
+ /* begin browserify */
var bScriptPath = util.format("%s.%s", scriptPath, 'browserify');
+ requireTr.addModule({symbol: new RegExp(moduleName), path: bScriptPath});
+ /* end browserify */
var scriptContent = fs.readFileSync(scriptPath, 'utf-8');
fs.writeFileSync(bScriptPath, scriptContent, 'utf-8');
@@ -237,7 +243,10 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
// Add it to the list of module objects bound for cordova_plugins.json
moduleObjects.push(obj);
+ /* begin browserify */
+ libraryRelease.transform(requireTr.transform);
libraryRelease.add(bScriptPath);
+ /* end browserify */
});
});
@@ -273,6 +282,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
outReleaseFileStream.on('finish', function() {
var newtime = new Date().valueOf() - time;
plugman.emit('verbose', 'generated cordova.' + platform + '.js @ ' + commitId + ' in ' + newtime + 'ms');
+ // TODO clean up all the *.browserify files
});
outReleaseFileStream.on('error', function(err) {
@@ -280,4 +290,5 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
console.log('error while generating cordova_b.js');
plugman.emit('verbose', 'error while generating cordova.js');
});
+ /* end browserify */
};
[15/28] git commit: adding browserify bundle
Posted by an...@apache.org.
adding browserify bundle
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/8229393c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/8229393c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/8229393c
Branch: refs/heads/master
Commit: 8229393c1bdc67b2c3f38e222cc6da029cb45d91
Parents: 62e3e36
Author: Anis Kadri <an...@apache.org>
Authored: Mon Mar 17 14:52:10 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:44:04 2014 -0700
----------------------------------------------------------------------
src/prepare.js | 60 ++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 43 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8229393c/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 361249d..3b2fbb5 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -19,20 +19,20 @@
/* jshint node:true */
-var platform_modules = require('./platforms'),
- path = require('path'),
- config_changes = require('./util/config-changes'),
- xml_helpers = require('./util/xml-helpers'),
- wp7 = require('./platforms/wp7'),
- wp8 = require('./platforms/wp8'),
- windows8 = require('./platforms/windows8'),
- common = require('./platforms/common');
- fs = require('fs'),
- shell = require('shelljs'),
- util = require('util'),
- events = require('./events'),
- plugman = require('../plugman'),
- et = require('elementtree');
+var platform_modules = require('./platforms'),
+ path = require('path'),
+ config_changes = require('./util/config-changes'),
+ xml_helpers = require('./util/xml-helpers'),
+ wp7 = require('./platforms/wp7'),
+ wp8 = require('./platforms/wp8'),
+ windows8 = require('./platforms/windows8'),
+ common = require('./platforms/common');
+ fs = require('fs'),
+ shell = require('shelljs'),
+ util = require('util'),
+ plugman = require('../plugman'),
+ et = require('elementtree'),
+ writeLicenseHeader = require('cordova-js/tasks/lib/write-license-header');
// Called on --prepare.
// Sets up each plugin's Javascript code to be loaded properly.
@@ -116,6 +116,10 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
}
}
+
+ /* begin browserify */
+ var libraryRelease = bundle(platform, false, 'N/A');
+ /* end browserify */
platform_json = config_changes.get_platform_json(plugins_dir, platform);
// This array holds all the metadata for each module and ends up in cordova_plugins.json
@@ -173,12 +177,17 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
if (module.attrib.name) {
moduleName += module.attrib.name;
} else {
- var result = module.attrib.src.match(/([^\/]+)\.js/);
- moduleName += result[1];
+ // var result = module.attrib.src.match(/([^\/]+)\.js/);
+ // moduleName += result[1];
+ moduleName = path.basename(module.attrib.src, '.js');
}
var fsPath = path.join.apply(path, pathParts);
- var scriptContent = fs.readFileSync(path.join(pluginDir, fsPath), 'utf-8');
+ var scriptPath = path.join(pluginDir, fsPath);
+
+ libraryRelease.add(fsPath);
+
+ var scriptContent = fs.readFileSync(scriptPath, 'utf-8');
scriptContent = 'cordova.define("' + moduleName + '", function(require, exports, module) { ' + scriptContent + '\n});\n';
fs.writeFileSync(path.join(platformPluginsDir, plugin_id, fsPath), scriptContent, 'utf-8');
if(platform == 'wp7' || platform == 'wp8' || platform == "windows8") {
@@ -229,4 +238,21 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
wp_csproj.addSourceFile(path.join('www', 'cordova_plugins.js'));
wp_csproj.write();
}
+
+ /* begin browserify */
+ var outReleaseFile = path.join('pkg', 'cordova.' + platform + '.js');
+ var outReleaseFileStream = fs.createWriteStream(outReleaseFile);
+ var commitId = 'N/A';
+
+ writeLicenseHeader(outReleaseFileStream, platform, commitId);
+
+ releaseBundle = libraryRelease.bundle();
+
+ releaseBundle.pipe(outReleaseFileStream);
+
+ releaseBundle.on('end', function() {
+ var newtime = new Date().valueOf() - time;
+ plugman.emit('verbose', 'generated cordova.' + platform + '.js @ ' + commitId + ' in ' + newtime + 'ms');
+ });
+ /* end browserify */
};
[17/28] git commit: adding clobbers/merges support
Posted by an...@apache.org.
adding clobbers/merges support
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/ef1b980b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/ef1b980b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/ef1b980b
Branch: refs/heads/master
Commit: ef1b980beeb697e9836cba104af065c699cb174c
Parents: 781ec24
Author: Anis Kadri <an...@apache.org>
Authored: Thu Mar 27 19:48:50 2014 +0100
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:45:01 2014 -0700
----------------------------------------------------------------------
src/prepare.js | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/ef1b980b/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 6fe2fe1..8b770e1 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -185,10 +185,11 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
var fsPath = path.join.apply(path, pathParts);
var scriptPath = path.join(pluginDir, fsPath);
-
- libraryRelease.add(scriptPath);
+ var bScriptPath = util.format("%s.%s", scriptPath, 'browserify');
var scriptContent = fs.readFileSync(scriptPath, 'utf-8');
+ fs.writeFileSync(bScriptPath, scriptContent, 'utf-8');
+
scriptContent = 'cordova.define("' + moduleName + '", function(require, exports, module) { ' + scriptContent + '\n});\n';
fs.writeFileSync(path.join(platformPluginsDir, plugin_id, fsPath), scriptContent, 'utf-8');
if(platform == 'wp7' || platform == 'wp8' || platform == "windows8") {
@@ -208,11 +209,27 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
obj.clobbers = [];
}
obj.clobbers.push(child.attrib.target);
+ /* FIXME: browserify guettho clobber */
+ fs.appendFileSync(bScriptPath,
+ util.format(
+ "require('cordova/builder').assignOrWrapInDeprecateGetter(window, '%s', module.exports);",
+ child.attrib.target
+ ),
+ 'utf-8');
+ /* end browserify guettho clobber */
} else if (child.tag.toLowerCase() == 'merges') {
if (!obj.merges) {
obj.merges = [];
}
obj.merges.push(child.attrib.target);
+ /* FIXME: browserify guettho clobber */
+ fs.appendFileSync(bScriptPath,
+ util.format(
+ "require('cordova/builder').recursiveMerge(window, '%s', module.exports);",
+ child.attrib.target
+ ),
+ 'utf-8');
+ /* end browserify guettho clobber */
} else if (child.tag.toLowerCase() == 'runs') {
obj.runs = true;
}
@@ -220,6 +237,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
// Add it to the list of module objects bound for cordova_plugins.json
moduleObjects.push(obj);
+ libraryRelease.add(bScriptPath);
});
});
[20/28] git commit: removing window from target
Posted by an...@apache.org.
removing window from target
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/8fea8b0f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/8fea8b0f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/8fea8b0f
Branch: refs/heads/master
Commit: 8fea8b0fb6c4cb87ccbc82eec267e8072cf5945f
Parents: 8426f9a
Author: Anis Kadri <an...@apache.org>
Authored: Tue Apr 8 18:55:23 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:45:45 2014 -0700
----------------------------------------------------------------------
src/util/prepare-namespace.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8fea8b0f/src/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/src/util/prepare-namespace.js b/src/util/prepare-namespace.js
index 3c19d13..2cb9560 100644
--- a/src/util/prepare-namespace.js
+++ b/src/util/prepare-namespace.js
@@ -1,5 +1,8 @@
// FIXME this is extremely guettho
module.exports = function(target, method) {
+
+ target = target.replace(/^window(\.)?/, '');
+
var lastDot = target.lastIndexOf('.');
var namespace = target.substr(0, lastDot);
var lastName = target.substr(lastDot + 1);
[21/28] git commit: adding message to exception
Posted by an...@apache.org.
adding message to exception
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/752be1b2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/752be1b2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/752be1b2
Branch: refs/heads/master
Commit: 752be1b2db0f87f06eef5917ec4f7c6a55166baf
Parents: 8fea8b0
Author: Anis Kadri <an...@apache.org>
Authored: Wed Apr 9 16:24:51 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:45:45 2014 -0700
----------------------------------------------------------------------
main.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/752be1b2/main.js
----------------------------------------------------------------------
diff --git a/main.js b/main.js
index cb08923..68273fd 100755
--- a/main.js
+++ b/main.js
@@ -54,7 +54,7 @@ if (cli_opts.plugins_dir || cli_opts.project) {
process.on('uncaughtException', function(error) {
if (cli_opts.debug) {
- console.error(error.stack);
+ console.error(error.message, error.stack);
} else {
console.error(error.message);
}
[07/28] git commit: adding clobbers/merges support
Posted by an...@apache.org.
adding clobbers/merges support
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/cd13a49a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/cd13a49a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/cd13a49a
Branch: refs/heads/master
Commit: cd13a49a7ae5ab110b132d67fe64d222da0b54d9
Parents: 57bba0d
Author: Anis Kadri <an...@apache.org>
Authored: Thu Mar 27 19:48:50 2014 +0100
Committer: Anis Kadri <an...@apache.org>
Committed: Thu Mar 27 19:48:50 2014 +0100
----------------------------------------------------------------------
src/prepare.js | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/cd13a49a/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index fd12d34..5c6b694 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -187,10 +187,11 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
var fsPath = path.join.apply(path, pathParts);
var scriptPath = path.join(pluginDir, fsPath);
-
- libraryRelease.add(scriptPath);
+ var bScriptPath = util.format("%s.%s", scriptPath, 'browserify');
var scriptContent = fs.readFileSync(scriptPath, 'utf-8');
+ fs.writeFileSync(bScriptPath, scriptContent, 'utf-8');
+
scriptContent = 'cordova.define("' + moduleName + '", function(require, exports, module) { ' + scriptContent + '\n});\n';
fs.writeFileSync(path.join(platformPluginsDir, plugin_id, fsPath), scriptContent, 'utf-8');
if(platform == 'wp7' || platform == 'wp8' || platform == "windows8") {
@@ -210,11 +211,27 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
obj.clobbers = [];
}
obj.clobbers.push(child.attrib.target);
+ /* FIXME: browserify guettho clobber */
+ fs.appendFileSync(bScriptPath,
+ util.format(
+ "require('cordova/builder').assignOrWrapInDeprecateGetter(window, '%s', module.exports);",
+ child.attrib.target
+ ),
+ 'utf-8');
+ /* end browserify guettho clobber */
} else if (child.tag.toLowerCase() == 'merges') {
if (!obj.merges) {
obj.merges = [];
}
obj.merges.push(child.attrib.target);
+ /* FIXME: browserify guettho clobber */
+ fs.appendFileSync(bScriptPath,
+ util.format(
+ "require('cordova/builder').recursiveMerge(window, '%s', module.exports);",
+ child.attrib.target
+ ),
+ 'utf-8');
+ /* end browserify guettho clobber */
} else if (child.tag.toLowerCase() == 'runs') {
obj.runs = true;
}
@@ -222,6 +239,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
// Add it to the list of module objects bound for cordova_plugins.json
moduleObjects.push(obj);
+ libraryRelease.add(bScriptPath);
});
});
[28/28] git commit: Merge branch 'master' into browserify
Posted by an...@apache.org.
Merge branch 'master' into browserify
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/013adc61
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/013adc61
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/013adc61
Branch: refs/heads/master
Commit: 013adc61c852561810994d899692d63b65176c6c
Parents: 93c6578 8aca4cb
Author: Anis Kadri <an...@apache.org>
Authored: Thu Apr 24 14:13:08 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Thu Apr 24 14:13:08 2014 -0700
----------------------------------------------------------------------
README.md | 8 ++---
RELEASENOTES.md | 6 ++--
spec/common.js | 2 +-
spec/install.spec.js | 18 +++++------
spec/platforms/amazon-fireos.spec.js | 10 +++---
spec/platforms/common.spec.js | 2 +-
spec/platforms/ios.spec.js | 6 ++--
spec/platforms/windows8.spec.js | 2 +-
spec/platforms/wp7.spec.js | 2 +-
spec/platforms/wp8.spec.js | 2 +-
spec/plugins/Contacts/src/wp/Contacts.cs | 4 +--
spec/plugins/FaultyPlugin/plugin.xml | 4 +--
.../WebNotifications/src/ios/AppDelegate.m.diff | 2 +-
.../WebNotifications/src/ios/WebNotifications.h | 2 +-
.../WebNotifications/src/ios/WebNotifications.m | 2 +-
.../WebNotifications/www/webnotifications.js | 2 +-
.../src/blackberry10/native/public/json/value.h | 8 ++---
.../blackberry10/native/public/json/writer.h | 4 +--
.../native/public/json_batchallocator.h | 8 ++---
.../native/public/json_internalmap.inl | 2 +-
.../blackberry10/native/public/json_value.cpp | 2 +-
.../blackberry10/native/public/json_writer.cpp | 6 ++--
.../src/blackberry10/native/public/plugin.cpp | 2 +-
spec/projects/android_one/assets/www/cordova.js | 6 ++--
spec/projects/android_one/cordova/lib/cordova | 6 ++--
spec/projects/windows8/www/cordova-2.6.0.js | 6 ++--
spec/projects/windows8/www/js/index.js | 2 +-
spec/uninstall.spec.js | 34 ++++++++++----------
spec/util/config-changes.spec.js | 4 +--
spec/util/csproj.spec.js | 4 +--
src/install.js | 14 ++++----
src/platform.js | 2 +-
src/platforms/common.js | 4 +--
src/platforms/firefoxos.js | 2 +-
src/platforms/ios.js | 2 +-
src/platforms/windows8.js | 6 ++--
src/platforms/wp8.js | 2 +-
src/prepare.js | 2 +-
src/registry/manifest.js | 13 ++++++++
src/registry/registry.js | 2 +-
src/uninstall.js | 34 ++++++++++----------
src/util/config-changes.js | 8 ++---
src/util/csproj.js | 8 ++---
src/util/default-engines.js | 32 +++++++++---------
src/util/dependencies.js | 2 +-
src/util/plist-helpers.js | 10 +++---
src/util/plugins.js | 4 +--
src/util/w8jsproj.js | 16 ++++-----
src/util/xml-helpers.js | 6 ++--
49 files changed, 175 insertions(+), 162 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/013adc61/src/platforms/ios.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/013adc61/src/prepare.js
----------------------------------------------------------------------
[27/28] git commit: fixing empty merges
Posted by an...@apache.org.
fixing empty merges
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/93c65780
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/93c65780
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/93c65780
Branch: refs/heads/master
Commit: 93c65780a96818b21346d210c7d74bd28f66f94e
Parents: 7e05089
Author: Anis Kadri <an...@apache.org>
Authored: Thu Apr 24 14:12:05 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Thu Apr 24 14:12:05 2014 -0700
----------------------------------------------------------------------
src/platforms/ios.js | 6 +++---
src/prepare.js | 3 ++-
src/util/prepare-namespace.js | 8 ++++++--
3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/93c65780/src/platforms/ios.js
----------------------------------------------------------------------
diff --git a/src/platforms/ios.js b/src/platforms/ios.js
index 9631e64..16808a0 100644
--- a/src/platforms/ios.js
+++ b/src/platforms/ios.js
@@ -153,9 +153,9 @@ module.exports = {
// there is now double caching of iOS project files.
// Remove the cache here when install can handle
// a list of plugins at once.
- if (cachedProjectFiles[project_dir]) {
- return cachedProjectFiles[project_dir];
- }
+ // if (cachedProjectFiles[project_dir]) {
+ // return cachedProjectFiles[project_dir];
+ // }
// grab and parse pbxproj
// we don't want CordovaLib's xcode project
var project_files = glob.sync(path.join(project_dir, '*.xcodeproj', 'project.pbxproj'));
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/93c65780/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 9940dc1..9710569 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -27,7 +27,8 @@ var platform_modules = require('./platforms'),
wp7 = require('./platforms/wp7'),
wp8 = require('./platforms/wp8'),
windows8 = require('./platforms/windows8'),
- common = require('./platforms/common');
+ common = require('./platforms/common'),
+ events = require('./events'),
fs = require('fs'),
shell = require('shelljs'),
util = require('util'),
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/93c65780/src/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/src/util/prepare-namespace.js b/src/util/prepare-namespace.js
index 8c18b1f..a8a6e20 100644
--- a/src/util/prepare-namespace.js
+++ b/src/util/prepare-namespace.js
@@ -1,3 +1,5 @@
+var util = require('util');
+
// FIXME this is extremely guettho
module.exports = function(target, method) {
var old = target;
@@ -26,11 +28,13 @@ module.exports = function(target, method) {
object,
lastName
);
- } else if(method === "m") {
+ } else if(method === "m" && target !== "") {
return util.format(
"%s\n;require('cordova/builder').recursiveMerge(%s, module.exports);",
code,
- object
+ target
);
+ } else {
+ return "// no clobber or merges";
}
}
[04/28] git commit: fixing path
Posted by an...@apache.org.
fixing path
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/03bc66ca
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/03bc66ca
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/03bc66ca
Branch: refs/heads/master
Commit: 03bc66ca659b7ccc128c3e5973ce88a18150ea2c
Parents: eb4bc45
Author: Anis Kadri <an...@apache.org>
Authored: Tue Mar 18 17:35:27 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Mar 18 17:35:27 2014 -0700
----------------------------------------------------------------------
package.json | 2 --
src/prepare.js | 21 ++++++++++++++-------
2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/03bc66ca/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 18b3c76..22a039a 100644
--- a/package.json
+++ b/package.json
@@ -32,8 +32,6 @@
"rc": "0.3.0",
"tar": "0.1.x",
"request": "2.22.0",
- "browserify": "3.2.0",
- "through": "2.3.4",
"cordova-js": "3.x.x"
},
"devDependencies": {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/03bc66ca/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index e946cfb..60e8c64 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -32,8 +32,8 @@ var platform_modules = require('./platforms'),
util = require('util'),
plugman = require('../plugman'),
et = require('elementtree'),
-// bundle = require('cordova-js/tasks/lib/bundle-browserify');
-// writeLicenseHeader = require('cordova-js/tasks/lib/write-license-header');
+ bundle = require('cordova-js/tasks/lib/bundle-browserify');
+ writeLicenseHeader = require('cordova-js/tasks/lib/write-license-header');
// Called on --prepare.
// Sets up each plugin's Javascript code to be loaded properly.
@@ -243,19 +243,26 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
}
/* begin browserify */
- var outReleaseFile = path.join('pkg', 'cordova.' + platform + '.js');
+ var outReleaseFile = path.join(wwwDir, 'cordova-b.js');
var outReleaseFileStream = fs.createWriteStream(outReleaseFile);
var commitId = 'N/A';
-
+ var newTime = null;
+
writeLicenseHeader(outReleaseFileStream, platform, commitId);
-
+
releaseBundle = libraryRelease.bundle();
releaseBundle.pipe(outReleaseFileStream);
releaseBundle.on('end', function() {
- var newtime = new Date().valueOf() - time;
+ console.log('end');
+ newtime = new Date().valueOf() - time;
plugman.emit('verbose', 'generated cordova.' + platform + '.js @ ' + commitId + ' in ' + newtime + 'ms');
});
- /* end browserify */
+
+ releaseBundle.on('error', function(err) {
+ newtime = new Date().valueOf() - time;
+ console.log('error while generating cordova.js');
+ plugman.emit('verbose', 'error while generating cordova.js');
+ });
};
[16/28] git commit: cleanup
Posted by an...@apache.org.
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/b7bf8107
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/b7bf8107
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/b7bf8107
Branch: refs/heads/master
Commit: b7bf81073449d43d688a7b5ed6305d84d3996704
Parents: 149d1ec
Author: Anis Kadri <an...@apache.org>
Authored: Tue Mar 18 17:48:03 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:45:01 2014 -0700
----------------------------------------------------------------------
src/prepare.js | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b7bf8107/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index af18877..5510d76 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -186,7 +186,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
var fsPath = path.join.apply(path, pathParts);
var scriptPath = path.join(pluginDir, fsPath);
- libraryRelease.add(fsPath);
+ libraryRelease.add(scriptPath);
var scriptContent = fs.readFileSync(scriptPath, 'utf-8');
scriptContent = 'cordova.define("' + moduleName + '", function(require, exports, module) { ' + scriptContent + '\n});\n';
@@ -244,7 +244,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
var outReleaseFile = path.join(wwwDir, 'cordova-b.js');
var outReleaseFileStream = fs.createWriteStream(outReleaseFile);
var commitId = 'N/A';
- var newTime = null;
+ var time = new Date().valueOf();
writeLicenseHeader(outReleaseFileStream, platform, commitId);
@@ -253,14 +253,13 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
releaseBundle.pipe(outReleaseFileStream);
releaseBundle.on('end', function() {
- console.log('end');
- newtime = new Date().valueOf() - time;
+ var newtime = new Date().valueOf() - time;
plugman.emit('verbose', 'generated cordova.' + platform + '.js @ ' + commitId + ' in ' + newtime + 'ms');
});
releaseBundle.on('error', function(err) {
- newtime = new Date().valueOf() - time;
- console.log('error while generating cordova.js');
+ var newtime = new Date().valueOf() - time;
+ console.log('error while generating cordova_b.js');
plugman.emit('verbose', 'error while generating cordova.js');
});
};
[14/28] git commit: adding browserify and through as dependencies
Posted by an...@apache.org.
adding browserify and through as dependencies
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/9743f3f8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/9743f3f8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/9743f3f8
Branch: refs/heads/master
Commit: 9743f3f889d02fdee452a859d74beb5b6119ef87
Parents: 28318d8
Author: Anis Kadri <an...@apache.org>
Authored: Wed Mar 5 16:24:38 2014 -0800
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:21:19 2014 -0700
----------------------------------------------------------------------
package.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/9743f3f8/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 01634a5..20c18e4 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,9 @@
"npm": "1.3.4",
"rc": "0.3.0",
"tar": "0.1.x",
- "request": "2.22.0"
+ "request": "2.22.0",
+ "browserify": "3.2.0",
+ "through": "2.3.4"
},
"devDependencies": {
"temp": "0.6.x",
[25/28] git commit: Merge branch 'browserify' of
https://git-wip-us.apache.org/repos/asf/cordova-plugman into browserify
Posted by an...@apache.org.
Merge branch 'browserify' of https://git-wip-us.apache.org/repos/asf/cordova-plugman into browserify
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/2551a579
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/2551a579
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/2551a579
Branch: refs/heads/master
Commit: 2551a57989fc1e16c10be01e62af9639a6acb948
Parents: b225cd3 1e75868
Author: Anis Kadri <an...@apache.org>
Authored: Fri Apr 11 12:46:01 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:46:01 2014 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[23/28] git commit: fixing merge with no target
Posted by an...@apache.org.
fixing merge with no target
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/b225cd30
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/b225cd30
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/b225cd30
Branch: refs/heads/master
Commit: b225cd30878af37d0087ae17278dd410e0affe7f
Parents: 752be1b
Author: Anis Kadri <an...@apache.org>
Authored: Wed Apr 9 16:25:34 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:45:45 2014 -0700
----------------------------------------------------------------------
src/util/prepare-namespace.js | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b225cd30/src/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/src/util/prepare-namespace.js b/src/util/prepare-namespace.js
index 2cb9560..8c18b1f 100644
--- a/src/util/prepare-namespace.js
+++ b/src/util/prepare-namespace.js
@@ -1,6 +1,6 @@
// FIXME this is extremely guettho
module.exports = function(target, method) {
-
+ var old = target;
target = target.replace(/^window(\.)?/, '');
var lastDot = target.lastIndexOf('.');
@@ -8,9 +8,12 @@ module.exports = function(target, method) {
var lastName = target.substr(lastDot + 1);
var props = target.split(".");
var code = "";
- for(var i = 1, len = props.length ; i <= len ; i++) {
- var sub = props.slice(0, i).join(".");
- code += util.format("window.%s = window.%s || {};\n", sub, sub);
+
+ if(target !== "") {
+ for(var i = 1, len = props.length ; i <= len ; i++) {
+ var sub = props.slice(0, i).join(".");
+ code += util.format("window.%s = window.%s || {};\n", sub, sub);
+ }
}
props.unshift('window');
@@ -18,17 +21,16 @@ module.exports = function(target, method) {
// code = "\n";
if(method === "c") {
return util.format(
- "%s\n;require('cordova/builder').assignOrWrapInDeprecateGetter(%s, '%s', module.exports);",
+ "%s\nrequire('cordova/builder').assignOrWrapInDeprecateGetter(%s, '%s', module.exports);",
code,
object,
lastName
);
} else if(method === "m") {
return util.format(
- "%s\n;require('cordova/builder').recursiveMerge(%s, '%s', module.exports);",
+ "%s\n;require('cordova/builder').recursiveMerge(%s, module.exports);",
code,
- object,
- lastName
+ object
);
}
}
[26/28] git commit: Merge branch 'master' into browserify
Posted by an...@apache.org.
Merge branch 'master' into browserify
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/7e05089d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/7e05089d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/7e05089d
Branch: refs/heads/master
Commit: 7e05089d036b89d292b0b7de69d281979883b0c2
Parents: 2551a57 c14f6b8
Author: Anis Kadri <an...@apache.org>
Authored: Wed Apr 16 13:57:02 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Apr 16 13:57:02 2014 -0700
----------------------------------------------------------------------
src/fetch.js | 11 ++++++-----
src/platforms/amazon-fireos.js | 11 ++++++-----
src/platforms/android.js | 11 ++++++-----
src/platforms/blackberry10.js | 13 +++++++------
src/platforms/firefoxos.js | 19 ++++++++++---------
src/platforms/ios.js | 5 +++--
src/platforms/tizen.js | 19 ++++++++++---------
src/platforms/ubuntu.js | 9 +++++----
src/platforms/windows8.js | 13 +++++++------
src/platforms/wp7.js | 17 +++++++++--------
src/platforms/wp8.js | 17 +++++++++--------
src/util/action-stack.js | 13 +++++++------
src/util/plugins.js | 11 ++++++-----
src/util/w8jsproj.js | 11 ++++++-----
14 files changed, 97 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
[22/28] git commit: adding prepare namespace
Posted by an...@apache.org.
adding prepare namespace
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/8426f9af
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/8426f9af
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/8426f9af
Branch: refs/heads/master
Commit: 8426f9afe0ec8ca4679bef1f01740f85357f3dcd
Parents: 89c2dad
Author: Anis Kadri <an...@apache.org>
Authored: Tue Apr 8 18:37:27 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:45:45 2014 -0700
----------------------------------------------------------------------
src/prepare.js | 14 ++++----------
src/util/prepare-namespace.js | 31 +++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8426f9af/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index ae7f500..9940dc1 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -23,6 +23,7 @@ var platform_modules = require('./platforms'),
path = require('path'),
config_changes = require('./util/config-changes'),
xml_helpers = require('./util/xml-helpers'),
+ prepareNamespace = require('./util/prepare-namespace'),
wp7 = require('./platforms/wp7'),
wp8 = require('./platforms/wp8'),
windows8 = require('./platforms/windows8'),
@@ -215,14 +216,10 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
obj.clobbers = [];
}
obj.clobbers.push(child.attrib.target);
- /* FIXME: browserify guettho clobber */
+ //console.log(prepareNamespace(child.attrib.target, 'c'));
fs.appendFileSync(bScriptPath,
- util.format(
- "require('cordova/builder').assignOrWrapInDeprecateGetter(window, '%s', module.exports);",
- child.attrib.target
- ),
+ prepareNamespace(child.attrib.target, 'c'),
'utf-8');
- /* end browserify guettho clobber */
} else if (child.tag.toLowerCase() == 'merges') {
if (!obj.merges) {
obj.merges = [];
@@ -230,10 +227,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
obj.merges.push(child.attrib.target);
/* FIXME: browserify guettho clobber */
fs.appendFileSync(bScriptPath,
- util.format(
- "require('cordova/builder').recursiveMerge(window, '%s', module.exports);",
- child.attrib.target
- ),
+ prepareNamespace(child.attrib.target, 'm'),
'utf-8');
/* end browserify guettho clobber */
} else if (child.tag.toLowerCase() == 'runs') {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8426f9af/src/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/src/util/prepare-namespace.js b/src/util/prepare-namespace.js
new file mode 100644
index 0000000..3c19d13
--- /dev/null
+++ b/src/util/prepare-namespace.js
@@ -0,0 +1,31 @@
+// FIXME this is extremely guettho
+module.exports = function(target, method) {
+ var lastDot = target.lastIndexOf('.');
+ var namespace = target.substr(0, lastDot);
+ var lastName = target.substr(lastDot + 1);
+ var props = target.split(".");
+ var code = "";
+ for(var i = 1, len = props.length ; i <= len ; i++) {
+ var sub = props.slice(0, i).join(".");
+ code += util.format("window.%s = window.%s || {};\n", sub, sub);
+ }
+
+ props.unshift('window');
+ var object = props.slice(0, props.length - 1).join('.');
+// code = "\n";
+ if(method === "c") {
+ return util.format(
+ "%s\n;require('cordova/builder').assignOrWrapInDeprecateGetter(%s, '%s', module.exports);",
+ code,
+ object,
+ lastName
+ );
+ } else if(method === "m") {
+ return util.format(
+ "%s\n;require('cordova/builder').recursiveMerge(%s, '%s', module.exports);",
+ code,
+ object,
+ lastName
+ );
+ }
+}
[02/28] git commit: adding cordova-js as a dependency
Posted by an...@apache.org.
adding cordova-js as a dependency
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/497af4d5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/497af4d5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/497af4d5
Branch: refs/heads/master
Commit: 497af4d549ed80ef388683334b801c8e96053a24
Parents: 910dc7b
Author: Anis Kadri <an...@apache.org>
Authored: Mon Mar 17 14:49:25 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Mon Mar 17 14:49:25 2014 -0700
----------------------------------------------------------------------
package.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/497af4d5/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 5410416..18b3c76 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,8 @@
"tar": "0.1.x",
"request": "2.22.0",
"browserify": "3.2.0",
- "through": "2.3.4"
+ "through": "2.3.4",
+ "cordova-js": "3.x.x"
},
"devDependencies": {
"jasmine-node": "1.7.0",
[13/28] git commit: adding cordova-js as a dependency
Posted by an...@apache.org.
adding cordova-js as a dependency
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/62e3e368
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/62e3e368
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/62e3e368
Branch: refs/heads/master
Commit: 62e3e368390f53a8fd3b403a8d92e60e1a7ae846
Parents: 9743f3f
Author: Anis Kadri <an...@apache.org>
Authored: Mon Mar 17 14:49:25 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 11 12:21:19 2014 -0700
----------------------------------------------------------------------
package.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/62e3e368/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 20c18e4..60953f1 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,8 @@
"tar": "0.1.x",
"request": "2.22.0",
"browserify": "3.2.0",
- "through": "2.3.4"
+ "through": "2.3.4",
+ "cordova-js": "3.x.x"
},
"devDependencies": {
"temp": "0.6.x",
[12/28] git commit: fixing merge with no target
Posted by an...@apache.org.
fixing merge with no target
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/1e758680
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/1e758680
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/1e758680
Branch: refs/heads/master
Commit: 1e758680a101f7d7744f2889cf588cf7d0de7621
Parents: 7d85eaa
Author: Anis Kadri <an...@apache.org>
Authored: Wed Apr 9 16:25:34 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Apr 9 16:25:34 2014 -0700
----------------------------------------------------------------------
src/util/prepare-namespace.js | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/1e758680/src/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/src/util/prepare-namespace.js b/src/util/prepare-namespace.js
index 2cb9560..8c18b1f 100644
--- a/src/util/prepare-namespace.js
+++ b/src/util/prepare-namespace.js
@@ -1,6 +1,6 @@
// FIXME this is extremely guettho
module.exports = function(target, method) {
-
+ var old = target;
target = target.replace(/^window(\.)?/, '');
var lastDot = target.lastIndexOf('.');
@@ -8,9 +8,12 @@ module.exports = function(target, method) {
var lastName = target.substr(lastDot + 1);
var props = target.split(".");
var code = "";
- for(var i = 1, len = props.length ; i <= len ; i++) {
- var sub = props.slice(0, i).join(".");
- code += util.format("window.%s = window.%s || {};\n", sub, sub);
+
+ if(target !== "") {
+ for(var i = 1, len = props.length ; i <= len ; i++) {
+ var sub = props.slice(0, i).join(".");
+ code += util.format("window.%s = window.%s || {};\n", sub, sub);
+ }
}
props.unshift('window');
@@ -18,17 +21,16 @@ module.exports = function(target, method) {
// code = "\n";
if(method === "c") {
return util.format(
- "%s\n;require('cordova/builder').assignOrWrapInDeprecateGetter(%s, '%s', module.exports);",
+ "%s\nrequire('cordova/builder').assignOrWrapInDeprecateGetter(%s, '%s', module.exports);",
code,
object,
lastName
);
} else if(method === "m") {
return util.format(
- "%s\n;require('cordova/builder').recursiveMerge(%s, '%s', module.exports);",
+ "%s\n;require('cordova/builder').recursiveMerge(%s, module.exports);",
code,
- object,
- lastName
+ object
);
}
}