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/12/23 18:15:12 UTC
cordova-lib git commit: Revert "CB-8158 adding symbolList to
cordova.js" due to failing tests
Repository: cordova-lib
Updated Branches:
refs/heads/master 53c4d0d27 -> 4b6c14f1e
Revert "CB-8158 adding symbolList to cordova.js" due to failing tests
This reverts commit 3c6b473b38567c837f67a8242638a96a48fe93d0.
Conflicts:
cordova-lib/src/plugman/prepare-browserify.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/4b6c14f1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/4b6c14f1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/4b6c14f1
Branch: refs/heads/master
Commit: 4b6c14f1ebbe68a485071808b65943ee0555ec2d
Parents: 53c4d0d
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Dec 23 12:14:49 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Dec 23 12:14:49 2014 -0500
----------------------------------------------------------------------
cordova-lib/package.json | 3 +--
cordova-lib/src/plugman/prepare-browserify.js | 20 +++-----------------
2 files changed, 4 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/4b6c14f1/cordova-lib/package.json
----------------------------------------------------------------------
diff --git a/cordova-lib/package.json b/cordova-lib/package.json
index 06dc83f..7e157d9 100644
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@ -38,8 +38,7 @@
"cordova-js": "3.7.2",
"d8": "0.4.4",
"unorm": "1.3.3",
- "valid-identifier": "0.0.1",
- "through2": "0.6.3"
+ "valid-identifier": "0.0.1"
},
"devDependencies": {
"jshint": "2.5.8",
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/4b6c14f1/cordova-lib/src/plugman/prepare-browserify.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/prepare-browserify.js b/cordova-lib/src/plugman/prepare-browserify.js
index dfd6c39..f8a0726 100644
--- a/cordova-lib/src/plugman/prepare-browserify.js
+++ b/cordova-lib/src/plugman/prepare-browserify.js
@@ -24,7 +24,6 @@
var platform_modules = require('./platforms'),
path = require('path'),
- through = require('through2'),
config_changes = require('./util/config-changes'),
xml_helpers = require('../util/xml-helpers'),
wp8 = require('./platforms/wp8'),
@@ -63,26 +62,13 @@ function uninstallQueuedPlugins(platform_json, wwwDir) {
}
}
-function generateFinalBundle(platform, libraryRelease, outReleaseFile, commitId, platformVersion) {
+function generateFinalBundle(platform, libraryRelease, outReleaseFile, commitId, platformVersion, symbolList) {
var deferred = Q.defer();
var outReleaseFileStream = fs.createWriteStream(outReleaseFile);
var time = new Date().valueOf();
- var symbolList = null;
- var addSymbolList = through.obj(function(row, enc, next) {
- if(symbolList === null) {
- symbolList = requireTr.getModules();
- this.push(util.format("var symbolList = %s;\n%s\n", JSON.stringify(symbolList), row));
- } else {
- this.push(row);
- }
- next();
- });
-
- libraryRelease.pipeline.get('wrap').push(addSymbolList);
-
- writeLicenseHeader(outReleaseFileStream, platform, commitId, platformVersion);
+ writeLicenseHeader(outReleaseFileStream, platform, commitId, platformVersion, symbolList);
var releaseBundle = libraryRelease.bundle();
@@ -152,7 +138,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
if(!is_top_level) {
return Q();
}
- requireTr.init(platform);
+ requireTr.platform = platform;
var commitId;
return computeCommitIdSync()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org