Merge pull request #10020 from Snuffleupagus/addon-prefs-no-eslint
Ensure that the built `PdfJsDefaultPreferences.jsm` file won't be affected/touched during tree-wide ESLint rule changes in `mozilla-central` (PR 9571 follow-up)
This commit is contained in:
commit
27ebb41b8f
@ -751,15 +751,17 @@ function preprocessDefaultPreferences(content) {
|
||||
var preprocessor2 = require('./external/builder/preprocessor2.js');
|
||||
var licenseHeader = fs.readFileSync('./src/license_header.js').toString();
|
||||
|
||||
var GLOBALS = '/* eslint-disable */\n';
|
||||
var MODIFICATION_WARNING =
|
||||
'//\n// THIS FILE IS AUTOMATICALLY GENERATED, DO NOT EDIT MANUALLY!\n//\n';
|
||||
'//\n// THIS FILE IS GENERATED AUTOMATICALLY, DO NOT EDIT MANUALLY!\n//\n';
|
||||
|
||||
content = preprocessor2.preprocessPDFJSCode({
|
||||
rootPath: __dirname,
|
||||
defines: DEFINES,
|
||||
}, content);
|
||||
|
||||
return licenseHeader + '\n' + MODIFICATION_WARNING + '\n' + content + '\n';
|
||||
return (licenseHeader + '\n' + GLOBALS + '\n' + MODIFICATION_WARNING + '\n' +
|
||||
content + '\n');
|
||||
}
|
||||
|
||||
gulp.task('mozcentral-pre', ['buildnumber', 'locale'], function () {
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright 2017 Mozilla Foundation
|
||||
/* Copyright 2018 Mozilla Foundation
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @licstart The following is the entire license notice for the
|
||||
* Javascript code in this page
|
||||
*
|
||||
* Copyright 2017 Mozilla Foundation
|
||||
* Copyright 2018 Mozilla Foundation
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
Loading…
x
Reference in New Issue
Block a user