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

Add carriage return checks to make.js.

Browse Source 
The target.bundle and target.lint will throw if carriage return's are present
in the files that are being processed.
This commit is contained in:
Kalervo Kujala 2012-08-18 23:01:01 +03:00
parent d38781d72e
commit b13798f16c
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
make.js
View File

@ -27,6 +27,16 @@ var DEFINES = {
CHROME: false CHROME: false
}; };
//
// Helper functions
//
function throwIfCarriageReturnIsPresent(string) {
if (string.match(/.*\r.*/)) {
throw('Carriage Return\'s should not be present. Please remove them.\n' +
'Also check your setting for: git config core.autocrlf');
}
}
// //
// make all // make all
// //
@ -218,6 +228,9 @@ target.bundle = function() {
bundleVersion = exec('git log --format="%h" -n 1', bundleVersion = exec('git log --format="%h" -n 1',
{silent: true}).output.replace('\n', ''); {silent: true}).output.replace('\n', '');
// Handle only src/*.js for now.
throwIfCarriageReturnIsPresent(cat('*.js'));
// 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('pdf.js', ROOT_DIR + BUILD_TARGET, builder.preprocess('pdf.js', ROOT_DIR + BUILD_TARGET,
@ -671,15 +684,18 @@ target.lint = function() {
echo(); echo();
echo('### Linting JS files (this can take a while!)'); echo('### Linting JS files (this can take a while!)');
var LINT_FILES = 'src/*.js \ var LINT_FILES = ['src/*.js',
web/*.js \ 'web/*.js',
test/*.js \ 'test/*.js',
test/unit/*.js \ 'test/unit/*.js',
extensions/firefox/*.js \ 'extensions/firefox/*.js',
extensions/firefox/components/*.js \ 'extensions/firefox/components/*.js',
extensions/chrome/*.js'; 'extensions/chrome/*.js'];
exec('gjslint --nojsdoc ' + LINT_FILES); // Handle only src/*.js for now.
throwIfCarriageReturnIsPresent(cat('src/*.js'));
exec('gjslint --nojsdoc ' + LINT_FILES.join(' '));
}; };
// //
@ -692,3 +708,4 @@ target.clean = function() {
rm('-rf', BUILD_DIR); rm('-rf', BUILD_DIR);
}; };