diff --git a/README.md b/README.md index 953f76b..37433ba 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,10 @@ Scratch 3.0 as a standalone desktop application ### A note about `scratch-gui` Eventually, the `scratch-desktop` branch of the Scratch GUI repository will be merged with that repository's main -development line. For now, though, the `scratch-desktop` branch holds a few changes that are necessary for Scratch -Desktop to function correctly but are not yet merged into the main development branch. If you only intend to build or -work on the `scratch-desktop` repository then you can ignore this, but if you intend to work on `scratch-gui` as well, -make sure you use the `scratch-desktop` branch there. +development line. For now, though, the `scratch-desktop` branch holds a few changes that are necessary for the Scratch +app to function correctly but are not yet merged into the main development branch. If you only intend to build or work +on the `scratch-desktop` repository then you can ignore this, but if you intend to work on `scratch-gui` as well, make +sure you use the `scratch-desktop` branch there. Previously it was necessary to explicitly build `scratch-gui` before building `scratch-desktop`. This is no longer necessary and the related build scripts, such as `build-gui`, have been removed. @@ -56,7 +56,7 @@ Sometimes the macOS build process will result in a build which crashes on startu for an entry similar to this: ```text -failed to parse entitlements for Scratch Desktop[12345]: OSUnserializeXML: syntax error near line 1 +failed to parse entitlements for Scratch[12345]: OSUnserializeXML: syntax error near line 1 ``` This appears to be an issue with `codesign` itself. Rebooting your computer and trying to build again might help. Yes, diff --git a/electron-builder.yaml b/electron-builder.yaml index fc32724..e52e662 100644 --- a/electron-builder.yaml +++ b/electron-builder.yaml @@ -2,7 +2,7 @@ directories: buildResources: buildResources output: dist appId: edu.mit.scratch.scratch-desktop -productName: "Scratch Desktop" +productName: "Scratch 3" publish: # empty provider list = don't publish mac: category: public.app-category.education @@ -16,9 +16,12 @@ mac: hardenedRuntime: true icon: buildResources/ScratchDesktop.icns provisioningProfile: embedded.provisionprofile + artifactName: "Scratch ${version}.${ext}" target: - dmg - mas +dmg: + title: "Scratch ${version}" mas: category: public.app-category.education entitlements: buildResources/entitlements.mas.plist @@ -37,5 +40,7 @@ appx: identityName: ScratchFoundation.ScratchDesktop publisherDisplayName: "Scratch Foundation" publisher: "CN=2EC43DF1-469A-4119-9AB9-568A0A1FF65F" + artifactName: "Scratch ${version}.${ext}" nsis: oneClick: false # allow user to choose per-user or per-machine + artifactName: "Scratch ${version} Setup.${ext}" diff --git a/package.json b/package.json index c2f3c92..37a9de0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scratch-desktop", - "productName": "Scratch Desktop", + "productName": "Scratch", "description": "Scratch 3.0 as a self-contained desktop application", "author": "Scratch Foundation", "version": "3.15.0", diff --git a/src/main/index.js b/src/main/index.js index 229d4a4..9b0f04b 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -7,6 +7,7 @@ import {getFilterForExtension} from './FileFilters'; import telemetry from './ScratchDesktopTelemetry'; import MacOSMenu from './MacOSMenu'; import log from '../common/log.js'; +import {productName, version} from '../../package.json'; // suppress deprecation warning; this will be the default in Electron 9 app.allowRendererProcessReuse = true; @@ -202,7 +203,7 @@ const createAboutWindow = () => { height: 400, parent: _windows.main, search: 'route=about', - title: 'About Scratch Desktop' + title: `About ${productName}` }); return window; }; @@ -219,7 +220,7 @@ const createMainWindow = () => { const window = createWindow({ width: defaultSize.width, height: defaultSize.height, - title: 'Scratch Desktop' + title: `${productName} ${version}` // something like "Scratch 3.14" }); const webContents = window.webContents; diff --git a/src/renderer/about.jsx b/src/renderer/about.jsx index 8906fe3..9b121bc 100644 --- a/src/renderer/about.jsx +++ b/src/renderer/about.jsx @@ -26,16 +26,18 @@ const AboutElement = () => ( maxHeight: '10rem' }} /> -
{component} | {componentVersion} |
{component} | {componentVersion} |
Scratch Desktop is loading...
Scratch is loading...