Merge pull request #7990 from Snuffleupagus/addon-remove-network.js
[Firefox addon] Stop bundling `src/core/network.js` into the `FIREFOX`/`MOZCENTRAL` builds (PR 7322 follow-up)
This commit is contained in:
commit
e0a92a7f48
@ -21,7 +21,7 @@ Components.utils.import('resource://gre/modules/Services.jsm');
|
|||||||
var EXPORTED_SYMBOLS = ['NetworkManager'];
|
var EXPORTED_SYMBOLS = ['NetworkManager'];
|
||||||
|
|
||||||
function log(aMsg) {
|
function log(aMsg) {
|
||||||
var msg = 'network.js: ' + (aMsg.join ? aMsg.join('') : aMsg);
|
var msg = 'PdfJsNetwork.jsm: ' + (aMsg.join ? aMsg.join('') : aMsg);
|
||||||
Services.console.logStringMessage(msg);
|
Services.console.logStringMessage(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
make.js
2
make.js
@ -605,7 +605,6 @@ target.firefox = function() {
|
|||||||
preprocess: [
|
preprocess: [
|
||||||
[COMMON_WEB_FILES_PREPROCESS, FIREFOX_BUILD_CONTENT_DIR + '/web'],
|
[COMMON_WEB_FILES_PREPROCESS, FIREFOX_BUILD_CONTENT_DIR + '/web'],
|
||||||
[COMMON_FIREFOX_FILES_PREPROCESS, FIREFOX_BUILD_CONTENT_DIR],
|
[COMMON_FIREFOX_FILES_PREPROCESS, FIREFOX_BUILD_CONTENT_DIR],
|
||||||
[SRC_DIR + 'core/network.js', FIREFOX_BUILD_CONTENT_DIR],
|
|
||||||
[FIREFOX_EXTENSION_DIR + 'bootstrap.js', FIREFOX_BUILD_DIR]
|
[FIREFOX_EXTENSION_DIR + 'bootstrap.js', FIREFOX_BUILD_DIR]
|
||||||
],
|
],
|
||||||
preprocessCSS: [
|
preprocessCSS: [
|
||||||
@ -724,7 +723,6 @@ target.mozcentral = function() {
|
|||||||
preprocess: [
|
preprocess: [
|
||||||
[COMMON_WEB_FILES_PREPROCESS, MOZCENTRAL_CONTENT_DIR + '/web'],
|
[COMMON_WEB_FILES_PREPROCESS, MOZCENTRAL_CONTENT_DIR + '/web'],
|
||||||
[FIREFOX_CONTENT_DIR + 'pdfjschildbootstrap.js', MOZCENTRAL_CONTENT_DIR],
|
[FIREFOX_CONTENT_DIR + 'pdfjschildbootstrap.js', MOZCENTRAL_CONTENT_DIR],
|
||||||
[SRC_DIR + 'core/network.js', MOZCENTRAL_CONTENT_DIR],
|
|
||||||
[COMMON_FIREFOX_FILES_PREPROCESS, MOZCENTRAL_CONTENT_DIR],
|
[COMMON_FIREFOX_FILES_PREPROCESS, MOZCENTRAL_CONTENT_DIR],
|
||||||
[FIREFOX_CONTENT_DIR + 'PdfJs.jsm', MOZCENTRAL_CONTENT_DIR]
|
[FIREFOX_CONTENT_DIR + 'PdfJs.jsm', MOZCENTRAL_CONTENT_DIR]
|
||||||
],
|
],
|
||||||
|
@ -13,9 +13,6 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// NOTE: Be careful what goes in this file, as it is also used from the context
|
|
||||||
// of the addon. So using warn/error in here will break the addon.
|
|
||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
(function (root, factory) {
|
(function (root, factory) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user