You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/04/25 16:38:00 UTC
git commit: Revert "Merge branch 'master' into browserify"
Repository: cordova-plugman
Updated Branches:
refs/heads/master 013adc61c -> 0a0d3841e
Revert "Merge branch 'master' into browserify"
This reverts commit 013adc61c852561810994d899692d63b65176c6c, reversing
changes made to 8aca4cb5b1a8012aa23ba05386d10cb59b3b4817.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/0a0d3841
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/0a0d3841
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/0a0d3841
Branch: refs/heads/master
Commit: 0a0d3841e4d570b5ca71b434fdaf0bc681e78a72
Parents: 013adc6
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Apr 25 10:20:34 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Apr 25 10:20:34 2014 -0400
----------------------------------------------------------------------
main.js | 2 +-
package.json | 3 +-
src/platforms/ios.js | 6 +--
src/prepare.js | 91 +++++++-------------------------------
src/util/prepare-namespace.js | 40 -----------------
5 files changed, 22 insertions(+), 120 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a0d3841/main.js
----------------------------------------------------------------------
diff --git a/main.js b/main.js
index 68273fd..cb08923 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.message, error.stack);
+ console.error(error.stack);
} else {
console.error(error.message);
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a0d3841/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index c18faba..01634a5 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,7 @@
"npm": "1.3.4",
"rc": "0.3.0",
"tar": "0.1.x",
- "request": "2.22.0",
- "cordova-js": "3.x.x"
+ "request": "2.22.0"
},
"devDependencies": {
"temp": "0.6.x",
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a0d3841/src/platforms/ios.js
----------------------------------------------------------------------
diff --git a/src/platforms/ios.js b/src/platforms/ios.js
index b711e78..4f570c3 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/0a0d3841/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 02f9a67..c650306 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -19,24 +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'),
- prepareNamespace = require('./util/prepare-namespace'),
- wp7 = require('./platforms/wp7'),
- wp8 = require('./platforms/wp8'),
- windows8 = require('./platforms/windows8'),
- common = require('./platforms/common'),
- events = require('./events'),
- fs = require('fs'),
- shell = require('shelljs'),
- util = require('util'),
- 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');
+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');
// Called on --prepare.
// Sets up each plugin's Javascript code to be loaded properly.
@@ -120,11 +116,6 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
}
}
-
- /* begin browserify */
- requireTr.platform = platform;
- 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
@@ -182,22 +173,12 @@ 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];
- moduleName = path.basename(module.attrib.src, '.js');
+ var result = module.attrib.src.match(/([^\/]+)\.js/);
+ moduleName += result[1];
}
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');
-
+ var scriptContent = fs.readFileSync(path.join(pluginDir, fsPath), '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") {
@@ -217,20 +198,11 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
obj.clobbers = [];
}
obj.clobbers.push(child.attrib.target);
- //console.log(prepareNamespace(child.attrib.target, 'c'));
- fs.appendFileSync(bScriptPath,
- prepareNamespace(child.attrib.target, 'c'),
- 'utf-8');
} else if (child.tag.toLowerCase() == 'merges') {
if (!obj.merges) {
obj.merges = [];
}
obj.merges.push(child.attrib.target);
- /* FIXME: browserify guettho clobber */
- fs.appendFileSync(bScriptPath,
- prepareNamespace(child.attrib.target, 'm'),
- 'utf-8');
- /* end browserify guettho clobber */
} else if (child.tag.toLowerCase() == 'runs') {
obj.runs = true;
}
@@ -238,10 +210,6 @@ 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 */
});
});
@@ -261,29 +229,4 @@ 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(wwwDir, 'cordova-b.js');
- var outReleaseFileStream = fs.createWriteStream(outReleaseFile);
- var commitId = 'N/A';
- var time = new Date().valueOf();
-
- writeLicenseHeader(outReleaseFileStream, platform, commitId);
-
- releaseBundle = libraryRelease.bundle();
-
- releaseBundle.pipe(outReleaseFileStream);
-
- 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) {
- var newtime = new Date().valueOf() - time;
- console.log('error while generating cordova_b.js');
- plugman.emit('verbose', 'error while generating cordova.js');
- });
- /* end browserify */
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a0d3841/src/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/src/util/prepare-namespace.js b/src/util/prepare-namespace.js
deleted file mode 100644
index a8a6e20..0000000
--- a/src/util/prepare-namespace.js
+++ /dev/null
@@ -1,40 +0,0 @@
-var util = require('util');
-
-// FIXME this is extremely guettho
-module.exports = function(target, method) {
- var old = target;
- target = target.replace(/^window(\.)?/, '');
-
- var lastDot = target.lastIndexOf('.');
- var namespace = target.substr(0, lastDot);
- var lastName = target.substr(lastDot + 1);
- var props = target.split(".");
- var code = "";
-
- 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');
- var object = props.slice(0, props.length - 1).join('.');
-// code = "\n";
- if(method === "c") {
- return util.format(
- "%s\nrequire('cordova/builder').assignOrWrapInDeprecateGetter(%s, '%s', module.exports);",
- code,
- object,
- lastName
- );
- } else if(method === "m" && target !== "") {
- return util.format(
- "%s\n;require('cordova/builder').recursiveMerge(%s, module.exports);",
- code,
- target
- );
- } else {
- return "// no clobber or merges";
- }
-}