yetangitu/pdf.js
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4343 from brendandahl/ff-cleanup

Browse source 
Use only one resource url for moz central build.
This commit is contained in:
Yury Delendik 2014-03-04 20:29:27 -06:00
commit 192f09cd69
6 changed files with 27 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

22
make.js
View file

@ -448,7 +448,6 @@ target.firefox = function() {
'*.svg',
'*.png',
'*.manifest',
'components',
'locale',
'../../LICENSE'],
FIREFOX_EXTENSION_FILES =
@ -457,7 +456,6 @@ target.firefox = function() {
'chrome.manifest',
'icon.png',
'icon64.png',
'components',
'content',
'locale',
'LICENSE'],
@ -480,6 +478,12 @@ target.firefox = function() {
cp(FIREFOX_CONTENT_DIR + 'PdfJsTelemetry-addon.jsm',
FIREFOX_BUILD_CONTENT_DIR + 'PdfJsTelemetry.jsm');
cp(FIREFOX_CONTENT_DIR + 'PdfStreamConverter.jsm',
FIREFOX_BUILD_CONTENT_DIR);
cp(FIREFOX_CONTENT_DIR + 'PdfRedirector.jsm',
FIREFOX_BUILD_CONTENT_DIR);
// Copy extension files
cd(FIREFOX_EXTENSION_DIR);
cp('-R', FIREFOX_EXTENSION_FILES_TO_COPY, ROOT_DIR + FIREFOX_BUILD_DIR);
@ -520,11 +524,11 @@ target.firefox = function() {
FIREFOX_BUILD_DIR + '/update.rdf');
sed('-i', /PDFJSSCRIPT_STREAM_CONVERTER_ID/, FIREFOX_STREAM_CONVERTER_ID,
FIREFOX_BUILD_DIR + 'components/PdfStreamConverter.js');
FIREFOX_BUILD_CONTENT_DIR + 'PdfStreamConverter.jsm');
sed('-i', /PDFJSSCRIPT_PREF_PREFIX/, FIREFOX_PREF_PREFIX,
FIREFOX_BUILD_DIR + 'components/PdfStreamConverter.js');
FIREFOX_BUILD_CONTENT_DIR + 'PdfStreamConverter.jsm');
sed('-i', /PDFJSSCRIPT_MOZ_CENTRAL/, 'false',
FIREFOX_BUILD_DIR + 'components/PdfStreamConverter.js');
FIREFOX_BUILD_CONTENT_DIR + 'PdfStreamConverter.jsm');
// Update localized metadata
var localizedMetadata = cat(EXTENSION_SRC_DIR + '/firefox/metadata.inc');
@ -591,6 +595,8 @@ target.mozcentral = function() {
cp(FIREFOX_CONTENT_DIR + 'PdfJs.jsm', MOZCENTRAL_CONTENT_DIR);
cp(FIREFOX_CONTENT_DIR + 'PdfJsTelemetry.jsm', MOZCENTRAL_CONTENT_DIR);
cp(FIREFOX_CONTENT_DIR + 'PdfStreamConverter.jsm', MOZCENTRAL_CONTENT_DIR);
cp(FIREFOX_CONTENT_DIR + 'PdfRedirector.jsm', MOZCENTRAL_CONTENT_DIR);
// Copy extension files
cd('extensions/firefox');
@ -645,11 +651,11 @@ target.mozcentral = function() {
MOZCENTRAL_EXTENSION_DIR + 'README.mozilla');
sed('-i', /PDFJSSCRIPT_STREAM_CONVERTER_ID/, MOZCENTRAL_STREAM_CONVERTER_ID,
MOZCENTRAL_EXTENSION_DIR + 'components/PdfStreamConverter.js');
MOZCENTRAL_CONTENT_DIR + 'PdfStreamConverter.jsm');
sed('-i', /PDFJSSCRIPT_PREF_PREFIX/, MOZCENTRAL_PREF_PREFIX,
MOZCENTRAL_EXTENSION_DIR + 'components/PdfStreamConverter.js');
MOZCENTRAL_CONTENT_DIR + 'PdfStreamConverter.jsm');
sed('-i', /PDFJSSCRIPT_MOZ_CENTRAL/, 'true',
MOZCENTRAL_EXTENSION_DIR + 'components/PdfStreamConverter.js');
MOZCENTRAL_CONTENT_DIR + 'PdfStreamConverter.jsm');
// Copy test files
mkdir('-p', MOZCENTRAL_TEST_DIR);