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

make.js: Less greedy comment stripping

Browse Source 
The previous regex was too greedy, it stripped a significant amount of
code when I put another file after core/murmurhash3.js. This was caused
by the fact that the license header in murmurhash3.js does not contain
"Mozilla Foundation", so the regex continued to match until my new file
(which had the standard license header containing "Mozilla Foundation").
This commit is contained in:
Rob Wu 2015-07-08 23:49:14 +02:00
parent 8ba73cb4de
commit 1d4e450a79
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
make.js
View File

@ -482,9 +482,8 @@ target.bundle = function(args) {
cd(ROOT_DIR); cd(ROOT_DIR);
echo(); echo();
echo('### Bundling files into ' + BUILD_TARGET); echo('### Bundling files into ' + BUILD_TARGET);
var reg = /\n\/\* -\*- Mode(.|\n)*?Mozilla Foundation(.|\n)*?'use strict';/g;
function bundle(filename, dir, SRC_FILES, EXT_SRC_FILES) { function bundle(filename, outfilename, SRC_FILES, EXT_SRC_FILES) {
for (var i = 0, length = excludes.length; i < length; ++i) { for (var i = 0, length = excludes.length; i < length; ++i) {
var exclude = excludes[i]; var exclude = excludes[i];
var index = SRC_FILES.indexOf(exclude); var index = SRC_FILES.indexOf(exclude);
@ -500,15 +499,17 @@ target.bundle = function(args) {
crlfchecker.checkIfCrlfIsPresent(SRC_FILES); crlfchecker.checkIfCrlfIsPresent(SRC_FILES);
// Strip out all the vim/license headers. // Prepend a newline because stripCommentHeaders only strips comments that
bundleContent = bundleContent.replace(reg, ''); // follow a line feed. The file where bundleContent is inserted already
// contains a license header, so the header of bundleContent can be removed.
bundleContent = stripCommentHeaders('\n' + bundleContent);
// Append external files last since we don't want to modify them. // Append external files last since we don't want to modify them.
bundleContent += cat(EXT_SRC_FILES); bundleContent += cat(EXT_SRC_FILES);
// This just preprocesses the empty pdf.js file, we don't actually want to // This just preprocesses the empty pdf.js file, we don't actually want to
// preprocess everything yet since other build targets use this file. // preprocess everything yet since other build targets use this file.
builder.preprocess(filename, dir, builder.merge(defines, builder.preprocess(filename, outfilename, builder.merge(defines,
{BUNDLE: bundleContent, {BUNDLE: bundleContent,
BUNDLE_VERSION: bundleVersion, BUNDLE_VERSION: bundleVersion,
BUNDLE_BUILD: bundleBuild})); BUNDLE_BUILD: bundleBuild}));
@ -600,12 +601,21 @@ target.singlefile = function() {
}; };
function stripCommentHeaders(content, filename) {
// Strip out all the vim/license headers.
var notEndOfComment = '(?:[^*]|\\*(?!/))+';
var reg = new RegExp(
'\n/\\* -\\*- Mode' + notEndOfComment + '\\*/\\s*' +
'(?:/\\*' + notEndOfComment + '\\*/\\s*|//(?!#).*\n\\s*)+' +
'\'use strict\';', 'g');
content = content.replace(reg, '');
return content;
}
function cleanupJSSource(file) { function cleanupJSSource(file) {
var content = cat(file); var content = cat(file);
// Strip out all the vim/license headers. content = stripCommentHeaders(content, file);
var reg = /\n\/\* -\*- Mode(.|\n)*?Mozilla Foundation(.|\n)*?'use strict';/g;
content = content.replace(reg, '');
content.to(file); content.to(file);
} }