Skip to content

Commit

Permalink
Remove the ENABLE_SCRIPTING build-target, since it's not necessary
Browse files Browse the repository at this point in the history
There's no really compelling reason, as far as I can tell, to introduce the `ENABLE_SCRIPTING` build-target, instead of simply re-using the existing `TESTING` build-target for the new `gulp integrationtest` task.

In general there should be no problem with just always enable scripting in TESTING-builds, and if I were to *guess* the reason that this didn't seem to work was most likely because the Preferences ended up over-writing the `AppOptions`.
As it turns out the GENERIC-viewer has already has built-in support for disabling of Preferences, via the `AppOptions`, and this can be utilized in TESTING-builds as well to ensure that whatever `AppOptions` are set they're always respected.
  • Loading branch information
Snuffleupagus committed Dec 17, 2020
1 parent 7cc7683 commit df97fda
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 43 deletions.
55 changes: 18 additions & 37 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ const DEFINES = Object.freeze({
PRODUCTION: true,
SKIP_BABEL: true,
TESTING: false,
ENABLE_SCRIPTING: false,
// The main build targets:
GENERIC: false,
MOZCENTRAL: false,
Expand Down Expand Up @@ -661,7 +660,6 @@ gulp.task("default_preferences-pre", function () {
LIB: true,
BUNDLE_VERSION: 0, // Dummy version
BUNDLE_BUILD: 0, // Dummy build
ENABLE_SCRIPTING: process.env.ENABLE_SCRIPTING === "true",
}),
map: {
"pdfjs-lib": "../pdf",
Expand Down Expand Up @@ -1527,46 +1525,29 @@ gulp.task("testing-pre", function (done) {
done();
});

gulp.task("enable-scripting", function (done) {
process.env.ENABLE_SCRIPTING = "true";
done();
});

gulp.task(
"test",
gulp.series(
"enable-scripting",
"testing-pre",
"generic",
"components",
function () {
return streamqueue(
{ objectMode: true },
createTestSource("unit"),
createTestSource("browser"),
createTestSource("integration")
);
}
)
gulp.series("testing-pre", "generic", "components", function () {
return streamqueue(
{ objectMode: true },
createTestSource("unit"),
createTestSource("browser"),
createTestSource("integration")
);
})
);

gulp.task(
"bottest",
gulp.series(
"enable-scripting",
"testing-pre",
"generic",
"components",
function () {
return streamqueue(
{ objectMode: true },
createTestSource("unit", true),
createTestSource("font", true),
createTestSource("browser (no reftest)", true),
createTestSource("integration")
);
}
)
gulp.series("testing-pre", "generic", "components", function () {
return streamqueue(
{ objectMode: true },
createTestSource("unit", true),
createTestSource("font", true),
createTestSource("browser (no reftest)", true),
createTestSource("integration")
);
})
);

gulp.task(
Expand All @@ -1585,7 +1566,7 @@ gulp.task(

gulp.task(
"integrationtest",
gulp.series("enable-scripting", "testing-pre", "generic", function () {
gulp.series("testing-pre", "generic", function () {
return createTestSource("integration");
})
);
Expand Down
2 changes: 0 additions & 2 deletions src/pdf.sandbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ class Sandbox {
let code = [
"exports = Object.create(null);",
"module = Object.create(null);",
// Next line is replaced by code from initialization.js
// when we create the bundle for the sandbox.
PDFJSDev.eval("PDF_SCRIPTING_JS_SOURCE"),
`data = ${sandboxData};`,
`module.exports.initSandbox({ data, extra: {${extraStr}}, out: this});`,
Expand Down
7 changes: 3 additions & 4 deletions web/app_options.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const defaultOptions = {
},
enableScripting: {
/** @type {boolean} */
value: typeof PDFJSDev !== "undefined" && PDFJSDev.test("ENABLE_SCRIPTING"),
value: typeof PDFJSDev !== "undefined" && PDFJSDev.test("TESTING"),
kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
},
enableWebGL: {
Expand Down Expand Up @@ -249,7 +249,7 @@ if (
) {
defaultOptions.disablePreferences = {
/** @type {boolean} */
value: false,
value: typeof PDFJSDev !== "undefined" && PDFJSDev.test("TESTING"),
kind: OptionKind.VIEWER,
};
defaultOptions.locale = {
Expand All @@ -260,8 +260,7 @@ if (
defaultOptions.sandboxBundleSrc = {
/** @type {string} */
value:
typeof PDFJSDev === "undefined" ||
PDFJSDev.test("!PRODUCTION && !ENABLE_SCRIPTING")
typeof PDFJSDev === "undefined" || !PDFJSDev.test("PRODUCTION")
? "../build/dev-sandbox/pdf.sandbox.js"
: "../build/pdf.sandbox.js",
kind: OptionKind.VIEWER,
Expand Down

0 comments on commit df97fda

Please sign in to comment.