scratchfoundation/scratch-desktop
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-desktop.git synced 2024-12-23 06:02:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build APPX for both 32-bit and 64-bit

Browse source 
Previous APPX packages were 32-bit by default. At some point this
switched to 64-bit by default, but I didn't notice because the APPX
release was blocked at the time. This change enables both, which seems
ideal the MS Store will choose the right build for a given client.
This commit is contained in:
Christopher Willis-Ford 2021-01-28 14:13:21 -08:00
parent bcc821d3ea
commit 35f9001eec
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
electron-builder.yaml
View file

@ -40,7 +40,7 @@ appx:
identityName: ScratchFoundation.ScratchDesktop identityName: ScratchFoundation.ScratchDesktop
publisherDisplayName: "Scratch Foundation" publisherDisplayName: "Scratch Foundation"
publisher: "CN=2EC43DF1-469A-4119-9AB9-568A0A1FF65F" publisher: "CN=2EC43DF1-469A-4119-9AB9-568A0A1FF65F"
artifactName: "Scratch ${version}.${ext}" artifactName: "Scratch ${version} ${arch}.${ext}"
nsis: nsis:
oneClick: false # allow user to choose per-user or per-machine oneClick: false # allow user to choose per-user or per-machine
artifactName: "Scratch ${version} Setup.${ext}" artifactName: "Scratch ${version} Setup.${ext}"

4
scripts/electron-builder-wrapper.js
View file

@ -46,7 +46,7 @@ const getPlatformFlag = function () {
*/ */
const runBuilder = function (wrapperConfig, target) { const runBuilder = function (wrapperConfig, target) {
// the AppX build fails if CSC_* or WIN_CSC_* variables are set // the AppX build fails if CSC_* or WIN_CSC_* variables are set
const shouldStripCSC = (target.name === 'appx') || (!wrapperConfig.doSign); const shouldStripCSC = (target.name.indexOf('appx') === 0) || (!wrapperConfig.doSign);
const childEnvironment = shouldStripCSC ? stripCSC(process.env) : process.env; const childEnvironment = shouldStripCSC ? stripCSC(process.env) : process.env;
if (wrapperConfig.doSign && if (wrapperConfig.doSign &&
(target.name.indexOf('nsis') === 0) && (target.name.indexOf('nsis') === 0) &&
@ -110,7 +110,7 @@ const calculateTargets = function (wrapperConfig) {
platform: 'darwin' platform: 'darwin'
}, },
microsoftStore: { microsoftStore: {
name: 'appx', name: 'appx:ia32 appx:x64',
platform: 'win32' platform: 'win32'
}, },
windowsDirectDownload: { windowsDirectDownload: {