From d99eef6c3b39b1ae46f4155ee2502889b6cfc7ed Mon Sep 17 00:00:00 2001 From: Sebastiaan Marynissen Date: Sun, 26 Jan 2025 17:48:42 +0100 Subject: [PATCH 1/3] Update standard-deps.js --- scripts/standard-deps.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/standard-deps.js b/scripts/standard-deps.js index 9143fceb..8da5aa8d 100644 --- a/scripts/standard-deps.js +++ b/scripts/standard-deps.js @@ -1,6 +1,9 @@ // # standard-deps.js export default [ 'memo:essential-fixes', + 'memo:transparent-texture-fix-dll', + 'memo:region-thumbnail-fix-dll', + 'peg:oops-mod', 'simmaster07:sc4fix', 'simmaster07:extra-cheats-dll', ]; From e729744608e49c565e0c1bd90bd1712a9f4fbefa Mon Sep 17 00:00:00 2001 From: Sebastiaan Marynissen Date: Sun, 26 Jan 2025 17:58:59 +0100 Subject: [PATCH 2/3] Allow additional standard deps in .env See #104. This allows additional standard dependencies to be specified in the `.env` file under the `STANDARD_DEPENDENCIES` variable. --- scripts/standard-deps.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/standard-deps.js b/scripts/standard-deps.js index 8da5aa8d..b80d52f7 100644 --- a/scripts/standard-deps.js +++ b/scripts/standard-deps.js @@ -1,4 +1,5 @@ // # standard-deps.js +const env = process.env.STANDARD_DEPENDENCIES ?? ''; export default [ 'memo:essential-fixes', 'memo:transparent-texture-fix-dll', @@ -6,4 +7,5 @@ export default [ 'peg:oops-mod', 'simmaster07:sc4fix', 'simmaster07:extra-cheats-dll', + ...env.split(','), ]; From 652a073621c08123995995965c30afde665c1a8f Mon Sep 17 00:00:00 2001 From: Sebastiaan Marynissen Date: Sun, 26 Jan 2025 18:08:07 +0100 Subject: [PATCH 3/3] Accept default variants as well --- scripts/sc4pac.js | 5 ++++- scripts/standard-variants.js | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 scripts/standard-variants.js diff --git a/scripts/sc4pac.js b/scripts/sc4pac.js index 2bc320ab..4fdeba03 100644 --- a/scripts/sc4pac.js +++ b/scripts/sc4pac.js @@ -9,6 +9,7 @@ import yargs from 'yargs/yargs'; import { parseAllDocuments } from 'yaml'; import { Minimatch } from 'minimatch'; import standardDeps from './standard-deps.js'; +import standardVariants from './standard-variants.js'; // Parse the regular expressions for the packages const { argv } = yargs(hideBin(process.argv)); @@ -44,7 +45,9 @@ const json = { pluginsRoot, cacheRoot, tempRoot: `.${path.sep}temp`, - variant: {}, + variant: { + ...standardVariants, + }, channels: [ 'https://memo33.github.io/sc4pac/channel/', pathToFileURL(path.resolve(import.meta.dirname, '../dist/channel'))+'/', diff --git a/scripts/standard-variants.js b/scripts/standard-variants.js new file mode 100644 index 00000000..6566631c --- /dev/null +++ b/scripts/standard-variants.js @@ -0,0 +1,9 @@ +// # standard-variants.js +const variants = process.env.STANDARD_VARIANTS ?? ''; +export default { + driveside: 'right', + ...Object.fromEntries(variants.split(',').map(line => { + let [key, value] = line.trim().split('='); + return [key, value]; + })), +};