luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: allow multiple versions to be installed on windows (#3740)

Browse Source
This commit is contained in:
Peng Xiao
2023-08-14 23:40:00 +08:00
committed by GitHub
parent 1072db632e
commit 08da58aa1e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/electron/forge.config.js
View File

@@ -82,7 +82,7 @@ const makers = [
!process.env.SKIP_BUNDLE && { !process.env.SKIP_BUNDLE && {
name: '@electron-forge/maker-squirrel', name: '@electron-forge/maker-squirrel',
config: { config: {
name: 'AFFiNE', name: productName,
setupIcon: icoPath, setupIcon: icoPath,
iconUrl: windowsIconUrl, iconUrl: windowsIconUrl,
loadingGif: './resources/icons/affine_installing.gif', loadingGif: './resources/icons/affine_installing.gif',

4
apps/electron/scripts/generate-assets.mjs
View File

@@ -37,12 +37,14 @@ if (process.platform === 'win32') {
$.prefix = ''; $.prefix = '';
} }
$.env.DISTRIBUTION = 'desktop';
cd(repoRootDir); cd(repoRootDir);
// step 1: build web (nextjs) dist // step 1: build web (nextjs) dist
if (!process.env.SKIP_WEB_BUILD) { if (!process.env.SKIP_WEB_BUILD) {
await $`yarn -T run build:plugins`; await $`yarn -T run build:plugins`;
await $`DISTRIBUTION=desktop yarn nx build @affine/core`; await $`yarn nx build @affine/core`;
await fs.move(affineCoreOutDir, publicAffineOutDir, { overwrite: true }); await fs.move(affineCoreOutDir, publicAffineOutDir, { overwrite: true });
} }