akira
/
pdfjs-dist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Exclude make.js from the linting; fixes few lint make.js errors

notmasteryet 13 years ago
parent
e1c6bfd77b
commit
30888e94bd
2 changed files with 94 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Makefile
  2. 154
      make.js

4
Makefile
Unescape View File

@ -144,9 +144,9 @@ browser-test:
# To install gjslint, see: # To install gjslint, see:
# #
# <http://code.google.com/closure/utilities/docs/linter_howto.html> # <http://code.google.com/closure/utilities/docs/linter_howto.html>
SRC_DIRS := . src utils web test examples/helloworld extensions/firefox \ SRC_DIRS := src utils web test examples/helloworld extensions/firefox \
extensions/firefox/components extensions/chrome test/unit extensions/firefox/components extensions/chrome test/unit
GJSLINT_FILES = $(foreach DIR,$(SRC_DIRS),$(wildcard $(DIR)/*.js)) GJSLINT_FILES = $(foreach DIR, $(SRC_DIRS), $(wildcard $(DIR)/*.js))
lint: lint:
gjslint --nojsdoc $(GJSLINT_FILES) gjslint --nojsdoc $(GJSLINT_FILES)

154
make.js
Unescape View File

@ -1,12 +1,12 @@
#!/usr/bin/env node #!/usr/bin/env node
require('./external/shelljs/make'); require('./external/shelljs/make');
var ROOT_DIR = __dirname+'/', // absolute path to project's root var ROOT_DIR = __dirname + '/', // absolute path to project's root
BUILD_DIR = 'build/', BUILD_DIR = 'build/',
BUILD_TARGET = BUILD_DIR+'pdf.js', BUILD_TARGET = BUILD_DIR + 'pdf.js',
FIREFOX_BUILD_DIR = BUILD_DIR+'/firefox/', FIREFOX_BUILD_DIR = BUILD_DIR + '/firefox/',
EXTENSION_SRC_DIR = 'extensions/', EXTENSION_SRC_DIR = 'extensions/',
GH_PAGES_DIR = BUILD_DIR+'gh-pages/', GH_PAGES_DIR = BUILD_DIR + 'gh-pages/',
REPO = 'git@github.com:mozilla/pdf.js.git', REPO = 'git@github.com:mozilla/pdf.js.git',
PYTHON_BIN = 'python2.7'; PYTHON_BIN = 'python2.7';
@ -18,8 +18,7 @@ target.all = function() {
echo('Please specify a target. Available targets:'); echo('Please specify a target. Available targets:');
for (t in target) for (t in target)
if (t !== 'all') echo(' ' + t); if (t !== 'all') echo(' ' + t);
} };
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@ -41,18 +40,21 @@ target.web = function() {
echo(); echo();
echo('### Creating web site'); echo('### Creating web site');
cp(BUILD_TARGET, GH_PAGES_DIR+BUILD_TARGET); cp(BUILD_TARGET, GH_PAGES_DIR + BUILD_TARGET);
cp('-R', 'web/*', GH_PAGES_DIR+'/web'); cp('-R', 'web/*', GH_PAGES_DIR + '/web');
cp(FIREFOX_BUILD_DIR+'/*.xpi', FIREFOX_BUILD_DIR+'/*.rdf', GH_PAGES_DIR+EXTENSION_SRC_DIR+'firefox/'); cp(FIREFOX_BUILD_DIR + '/*.xpi', FIREFOX_BUILD_DIR + '/*.rdf',
cp(GH_PAGES_DIR+'/web/index.html.template', GH_PAGES_DIR+'/index.html'); GH_PAGES_DIR + EXTENSION_SRC_DIR + 'firefox/');
mv('-f', GH_PAGES_DIR+'/web/viewer-production.html', GH_PAGES_DIR+'/web/viewer.html'); cp(GH_PAGES_DIR + '/web/index.html.template', GH_PAGES_DIR + '/index.html');
mv('-f', GH_PAGES_DIR + '/web/viewer-production.html',
GH_PAGES_DIR + '/web/viewer.html');
cd(GH_PAGES_DIR); cd(GH_PAGES_DIR);
exec('git add -A'); exec('git add -A');
echo(); echo();
echo("Website built in "+GH_PAGES_DIR); echo("Website built in " + GH_PAGES_DIR);
echo("Don't forget to cd into "+GH_PAGES_DIR+" and issue 'git commit' to push changes."); echo("Don't forget to cd into " + GH_PAGES_DIR +
} " and issue 'git commit' to push changes.");
};
// //
// make production // make production
@ -61,7 +63,7 @@ target.web = function() {
target.production = function() { target.production = function() {
target.bundle(); target.bundle();
target.viewer(); target.viewer();
} };
// //
// make bundle // make bundle
@ -71,7 +73,7 @@ target.production = function() {
target.bundle = function() { target.bundle = function() {
cd(ROOT_DIR); cd(ROOT_DIR);
echo(); echo();
echo('### Bundling files into '+BUILD_TARGET); echo('### Bundling files into ' + BUILD_TARGET);
// File order matters // File order matters
var SRC_FILES = var SRC_FILES =
@ -102,11 +104,13 @@ target.bundle = function() {
cd('src'); cd('src');
var bundle = cat(SRC_FILES), var bundle = cat(SRC_FILES),
bundleVersion = exec('git log --format="%h" -n 1', {silent:true}).output.replace('\n', ''); bundleVersion = exec('git log --format="%h" -n 1',
{silent: true}).output.replace('\n', '');
sed(/.*PDFJSSCRIPT_INCLUDE_ALL.*\n/, bundle, 'pdf.js').to(ROOT_DIR+BUILD_TARGET); sed(/.*PDFJSSCRIPT_INCLUDE_ALL.*\n/, bundle, 'pdf.js')
sed('-i', 'PDFJSSCRIPT_BUNDLE_VER', bundleVersion, ROOT_DIR+BUILD_TARGET); .to(ROOT_DIR + BUILD_TARGET);
} sed('-i', 'PDFJSSCRIPT_BUNDLE_VER', bundleVersion, ROOT_DIR + BUILD_TARGET);
};
// //
// make viewer // make viewer
@ -120,10 +124,12 @@ target.viewer = function() {
cd('web'); cd('web');
// Remove development lines // Remove development lines
sed(/.*PDFJSSCRIPT_REMOVE_CORE.*\n/g, '', 'viewer.html').to('viewer-production.html'); sed(/.*PDFJSSCRIPT_REMOVE_CORE.*\n/g, '', 'viewer.html')
.to('viewer-production.html');
// Introduce snippet // Introduce snippet
sed('-i', /.*PDFJSSCRIPT_INCLUDE_BUILD.*\n/g, cat('viewer-snippet.html'), 'viewer-production.html'); sed('-i', /.*PDFJSSCRIPT_INCLUDE_BUILD.*\n/g, cat('viewer-snippet.html'),
} 'viewer-production.html');
};
// //
// make pagesrepo // make pagesrepo
@ -143,16 +149,17 @@ target.pagesrepo = function() {
echo(); echo();
echo('Cloning project repo...'); echo('Cloning project repo...');
echo('(This operation can take a while, depending on network conditions)'); echo('(This operation can take a while, depending on network conditions)');
exec('git clone -b gh-pages --depth=1 '+REPO+' '+GH_PAGES_DIR, {silent:true}); exec('git clone -b gh-pages --depth=1 ' + REPO + ' ' + ßGH_PAGES_DIR,
{silent: true});
echo('Done.'); echo('Done.');
} }
rm('-rf', GH_PAGES_DIR+'/*'); rm('-rf', GH_PAGES_DIR + '/*');
mkdir('-p', GH_PAGES_DIR+'/web'); mkdir('-p', GH_PAGES_DIR + '/web');
mkdir('-p', GH_PAGES_DIR+'/web/images'); mkdir('-p', GH_PAGES_DIR + '/web/images');
mkdir('-p', GH_PAGES_DIR+BUILD_DIR); mkdir('-p', GH_PAGES_DIR + BUILD_DIR);
mkdir('-p', GH_PAGES_DIR+EXTENSION_SRC_DIR+'/firefox'); mkdir('-p', GH_PAGES_DIR + EXTENSION_SRC_DIR + '/firefox');
} };
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@ -180,7 +187,7 @@ target.extension = function() {
target.production(); target.production();
target.firefox(); target.firefox();
target.chrome(); target.chrome();
} };
target.buildnumber = function() { target.buildnumber = function() {
cd(ROOT_DIR); cd(ROOT_DIR);
@ -188,11 +195,12 @@ target.buildnumber = function() {
echo('### Getting extension build number'); echo('### Getting extension build number');
// Build number is the number of commits since base version // Build number is the number of commits since base version
EXTENSION_BUILD_NUMBER = exec('git log --format=oneline '+EXTENSION_BASE_VERSION+'..', {silent:true}) EXTENSION_BUILD_NUMBER = exec('git log --format=oneline ' +
EXTENSION_BASE_VERSION + '..', {silent: true})
.output.match(/\n/g).length; // get # of lines in git output .output.match(/\n/g).length; // get # of lines in git output
echo('Extension build number: ' + EXTENSION_BUILD_NUMBER); echo('Extension build number: ' + EXTENSION_BUILD_NUMBER);
} };
// //
// make firefox // make firefox
@ -202,8 +210,8 @@ target.firefox = function() {
echo(); echo();
echo('### Building Firefox extension'); echo('### Building Firefox extension');
var FIREFOX_BUILD_CONTENT_DIR = FIREFOX_BUILD_DIR+'/content/', var FIREFOX_BUILD_CONTENT_DIR = FIREFOX_BUILD_DIR + '/content/',
FIREFOX_CONTENT_DIR = EXTENSION_SRC_DIR+'/firefox/content/', FIREFOX_CONTENT_DIR = EXTENSION_SRC_DIR + '/firefox/content/',
FIREFOX_EXTENSION_FILES_TO_COPY = FIREFOX_EXTENSION_FILES_TO_COPY =
['*.js', ['*.js',
'*.rdf', '*.rdf',
@ -224,50 +232,50 @@ target.firefox = function() {
// Clear out everything in the firefox extension build directory // Clear out everything in the firefox extension build directory
rm('-rf', FIREFOX_BUILD_DIR); rm('-rf', FIREFOX_BUILD_DIR);
mkdir('-p', FIREFOX_BUILD_CONTENT_DIR); mkdir('-p', FIREFOX_BUILD_CONTENT_DIR);
mkdir('-p', FIREFOX_BUILD_CONTENT_DIR+BUILD_DIR); mkdir('-p', FIREFOX_BUILD_CONTENT_DIR + BUILD_DIR);
mkdir('-p', FIREFOX_BUILD_CONTENT_DIR+'/web'); mkdir('-p', FIREFOX_BUILD_CONTENT_DIR + '/web');
// Copy extension files // Copy extension files
cd('extensions/firefox'); cd('extensions/firefox');
cp('-R', FIREFOX_EXTENSION_FILES_TO_COPY, ROOT_DIR+FIREFOX_BUILD_DIR); cp('-R', FIREFOX_EXTENSION_FILES_TO_COPY, ROOT_DIR + FIREFOX_BUILD_DIR);
cd(ROOT_DIR); cd(ROOT_DIR);
// Copy a standalone version of pdf.js inside the content directory // Copy a standalone version of pdf.js inside the content directory
cp(BUILD_TARGET, FIREFOX_BUILD_CONTENT_DIR+BUILD_DIR); cp(BUILD_TARGET, FIREFOX_BUILD_CONTENT_DIR + BUILD_DIR);
cp('-R', EXTENSION_WEB_FILES, FIREFOX_BUILD_CONTENT_DIR+'/web'); cp('-R', EXTENSION_WEB_FILES, FIREFOX_BUILD_CONTENT_DIR + '/web');
rm(FIREFOX_BUILD_CONTENT_DIR+'/web/viewer-production.html'); rm(FIREFOX_BUILD_CONTENT_DIR + '/web/viewer-production.html');
// Copy over the firefox extension snippet so we can inline pdf.js in it // Copy over the firefox extension snippet so we can inline pdf.js in it
cp('web/viewer-snippet-firefox-extension.html', FIREFOX_BUILD_CONTENT_DIR+'/web'); cp('web/viewer-snippet-firefox-extension.html', FIREFOX_BUILD_CONTENT_DIR + '/web');
// Modify the viewer so it does all the extension-only stuff. // Modify the viewer so it does all the extension-only stuff.
cd(FIREFOX_BUILD_CONTENT_DIR+'/web'); cd(FIREFOX_BUILD_CONTENT_DIR + '/web');
sed('-i', /.*PDFJSSCRIPT_INCLUDE_BUNDLE.*\n/, cat(ROOT_DIR+BUILD_TARGET), 'viewer-snippet-firefox-extension.html'); sed('-i', /.*PDFJSSCRIPT_INCLUDE_BUNDLE.*\n/, cat(ROOT_DIR + BUILD_TARGET), 'viewer-snippet-firefox-extension.html');
sed('-i', /.*PDFJSSCRIPT_REMOVE_CORE.*\n/g, '', 'viewer.html'); sed('-i', /.*PDFJSSCRIPT_REMOVE_CORE.*\n/g, '', 'viewer.html');
sed('-i', /.*PDFJSSCRIPT_REMOVE_FIREFOX_EXTENSION.*\n/g, '', 'viewer.html'); sed('-i', /.*PDFJSSCRIPT_REMOVE_FIREFOX_EXTENSION.*\n/g, '', 'viewer.html');
sed('-i', /.*PDFJSSCRIPT_INCLUDE_FIREFOX_EXTENSION.*\n/, cat('viewer-snippet-firefox-extension.html'), 'viewer.html'); sed('-i', /.*PDFJSSCRIPT_INCLUDE_FIREFOX_EXTENSION.*\n/, cat('viewer-snippet-firefox-extension.html'), 'viewer.html');
cd(ROOT_DIR); cd(ROOT_DIR);
// We don't need pdf.js anymore since its inlined // We don't need pdf.js anymore since its inlined
rm('-Rf', FIREFOX_BUILD_CONTENT_DIR+BUILD_DIR); rm('-Rf', FIREFOX_BUILD_CONTENT_DIR + BUILD_DIR);
// Update the build version number // Update the build version number
sed('-i', /PDFJSSCRIPT_BUILD/, EXTENSION_BUILD_NUMBER, FIREFOX_BUILD_DIR+'/install.rdf'); sed('-i', /PDFJSSCRIPT_BUILD/, EXTENSION_BUILD_NUMBER, FIREFOX_BUILD_DIR + '/install.rdf');
sed('-i', /PDFJSSCRIPT_BUILD/, EXTENSION_BUILD_NUMBER, FIREFOX_BUILD_DIR+'/update.rdf'); sed('-i', /PDFJSSCRIPT_BUILD/, EXTENSION_BUILD_NUMBER, FIREFOX_BUILD_DIR + '/update.rdf');
// Create the xpi // Create the xpi
cd(FIREFOX_BUILD_DIR); cd(FIREFOX_BUILD_DIR);
exec('zip -r '+FIREFOX_EXTENSION_NAME+' '+FIREFOX_EXTENSION_FILES.join(' ')); exec('zip -r ' + FIREFOX_EXTENSION_NAME + ' ' + FIREFOX_EXTENSION_FILES.join(' '));
echo('extension created: ' + FIREFOX_EXTENSION_NAME); echo('extension created: ' + FIREFOX_EXTENSION_NAME);
cd(ROOT_DIR); cd(ROOT_DIR);
// Build the amo extension too (remove the updateUrl) // Build the amo extension too (remove the updateUrl)
cd(FIREFOX_BUILD_DIR); cd(FIREFOX_BUILD_DIR);
sed('-i', /.*updateURL.*\n/, '', 'install.rdf'); sed('-i', /.*updateURL.*\n/, '', 'install.rdf');
exec('zip -r '+FIREFOX_AMO_EXTENSION_NAME+' '+FIREFOX_EXTENSION_FILES.join(' ')); exec('zip -r ' + FIREFOX_AMO_EXTENSION_NAME + ' ' + FIREFOX_EXTENSION_FILES.join(' '));
echo('AMO extension created: ' + FIREFOX_AMO_EXTENSION_NAME); echo('AMO extension created: ' + FIREFOX_AMO_EXTENSION_NAME);
cd(ROOT_DIR); cd(ROOT_DIR);
} };
// //
// make chrome // make chrome
@ -277,9 +285,9 @@ target.chrome = function() {
echo(); echo();
echo('### Building Chrome extension'); echo('### Building Chrome extension');
var CHROME_BUILD_DIR = BUILD_DIR+'/chrome/', var CHROME_BUILD_DIR = BUILD_DIR + '/chrome/',
CHROME_CONTENT_DIR = EXTENSION_SRC_DIR+'/chrome/content/', CHROME_CONTENT_DIR = EXTENSION_SRC_DIR + '/chrome/content/',
CHROME_BUILD_CONTENT_DIR = CHROME_BUILD_DIR+'/content/', CHROME_BUILD_CONTENT_DIR = CHROME_BUILD_DIR + '/content/',
CHROME_EXTENSION_FILES = CHROME_EXTENSION_FILES =
['extensions/chrome/*.json', ['extensions/chrome/*.json',
'extensions/chrome/*.html']; 'extensions/chrome/*.html'];
@ -291,17 +299,18 @@ target.chrome = function() {
// Clear out everything in the chrome extension build directory // Clear out everything in the chrome extension build directory
rm('-Rf', CHROME_BUILD_DIR); rm('-Rf', CHROME_BUILD_DIR);
mkdir('-p', CHROME_BUILD_CONTENT_DIR); mkdir('-p', CHROME_BUILD_CONTENT_DIR);
mkdir('-p', CHROME_BUILD_CONTENT_DIR+BUILD_DIR); mkdir('-p', CHROME_BUILD_CONTENT_DIR + BUILD_DIR);
mkdir('-p', CHROME_BUILD_CONTENT_DIR+'/web'); mkdir('-p', CHROME_BUILD_CONTENT_DIR + '/web');
// Copy extension files // Copy extension files
cp('-R', CHROME_EXTENSION_FILES, CHROME_BUILD_DIR); cp('-R', CHROME_EXTENSION_FILES, CHROME_BUILD_DIR);
// Copy a standalone version of pdf.js inside the content directory // Copy a standalone version of pdf.js inside the content directory
cp(BUILD_TARGET, CHROME_BUILD_CONTENT_DIR+BUILD_DIR); cp(BUILD_TARGET, CHROME_BUILD_CONTENT_DIR + BUILD_DIR);
cp('-R', EXTENSION_WEB_FILES, CHROME_BUILD_CONTENT_DIR+'/web'); cp('-R', EXTENSION_WEB_FILES, CHROME_BUILD_CONTENT_DIR + '/web');
mv('-f', CHROME_BUILD_CONTENT_DIR+'/web/viewer-production.html', CHROME_BUILD_CONTENT_DIR+'/web/viewer.html'); mv('-f', CHROME_BUILD_CONTENT_DIR + '/web/viewer-production.html',
} CHROME_BUILD_CONTENT_DIR + '/web/viewer.html');
};
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@ -315,7 +324,7 @@ target.chrome = function() {
target.test = function() { target.test = function() {
target.browsertest(); target.browsertest();
target.unittest(); target.unittest();
} };
// //
// make browsertest // make browsertest
@ -328,15 +337,16 @@ target.browsertest = function() {
var PDF_TEST = env['PDF_TEST'] || 'test_manifest.json', var PDF_TEST = env['PDF_TEST'] || 'test_manifest.json',
PDF_BROWSERS = env['PDF_BROWSERS'] || 'resources/browser_manifests/browser_manifest.json'; PDF_BROWSERS = env['PDF_BROWSERS'] || 'resources/browser_manifests/browser_manifest.json';
if (!exists('test/'+PDF_BROWSERS)) { if (!exists('test/' + PDF_BROWSERS)) {
echo('Browser manifest file test/'+PDF_BROWSERS+' does not exist.'); echo('Browser manifest file test/' + PDF_BROWSERS + ' does not exist.');
echo('Try copying one of the examples in test/resources/browser_manifests/'); echo('Try copying one of the examples in test/resources/browser_manifests/');
exit(1); exit(1);
} }
cd('test'); cd('test');
exec(PYTHON_BIN+' test.py --reftest --browserManifestFile='+PDF_BROWSERS+' --manifestFile='+PDF_TEST, {async:true}); exec(PYTHON_BIN + ' test.py --reftest --browserManifestFile=' + PDF_BROWSERS +
} ' --manifestFile=' + PDF_TEST, {async: true});
};
// //
// make unittest // make unittest
@ -347,10 +357,8 @@ target.unittest = function() {
echo('### Running unit tests'); echo('### Running unit tests');
cd('test/unit'); cd('test/unit');
exec('make', {async:true}); exec('make', {async: true});
} };
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@ -367,8 +375,8 @@ target.server = function() {
echo('### Starting local server'); echo('### Starting local server');
cd('test'); cd('test');
exec(PYTHON_BIN+' -u test.py --port=8888', {async:true}); exec(PYTHON_BIN + ' -u test.py --port=8888', {async: true});
} };
// //
// make lint // make lint
@ -386,8 +394,8 @@ target.lint = function() {
extensions/firefox/components/*.js \ extensions/firefox/components/*.js \
extensions/chrome/*.js'; extensions/chrome/*.js';
exec('gjslint --nojsdoc '+LINT_FILES); exec('gjslint --nojsdoc ' + LINT_FILES);
} };
// //
// make clean // make clean
@ -398,4 +406,4 @@ target.clean = function() {
echo('### Cleaning up project builds'); echo('### Cleaning up project builds');
rm('-rf', BUILD_DIR); rm('-rf', BUILD_DIR);
} };

Write Preview
Loading…
Cancel
Save