Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10020 from Snuffleupagus/addon-prefs-no-eslint

Browse Source 
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:
Tim van der Meij 2018-08-29 22:40:56 +02:00 committed by GitHub
commit 27ebb41b8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gulpfile.js
View File

@ -751,15 +751,17 @@ function preprocessDefaultPreferences(content) {
var preprocessor2 = require('./external/builder/preprocessor2.js'); var preprocessor2 = require('./external/builder/preprocessor2.js');
var licenseHeader = fs.readFileSync('./src/license_header.js').toString(); var licenseHeader = fs.readFileSync('./src/license_header.js').toString();
var GLOBALS = '/* eslint-disable */\n';
var MODIFICATION_WARNING = 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({ content = preprocessor2.preprocessPDFJSCode({
rootPath: __dirname, rootPath: __dirname,
defines: DEFINES, defines: DEFINES,
}, content); }, 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 () { gulp.task('mozcentral-pre', ['buildnumber', 'locale'], function () {

2
src/license_header.js
View File

@ -1,4 +1,4 @@
/* Copyright 2017 Mozilla Foundation /* Copyright 2018 Mozilla Foundation
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
src/license_header_libre.js
View File

@ -2,7 +2,7 @@
* @licstart The following is the entire license notice for the * @licstart The following is the entire license notice for the
* Javascript code in this page * Javascript code in this page
* *
* Copyright 2017 Mozilla Foundation * Copyright 2018 Mozilla Foundation
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.