Compare commits
2 Commits
11a0f3484d
...
eb49ba7ce3
| Author | SHA1 | Date | |
|---|---|---|---|
| eb49ba7ce3 | |||
| f63b1fbc37 |
BIN
assets/dmg/background.png
Normal file
BIN
assets/dmg/background.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
BIN
assets/dmg/background@2x.png
Normal file
BIN
assets/dmg/background@2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 29 KiB |
@ -189,6 +189,52 @@ function cleanStagingArtifacts(keepNames) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const MAC_DMG_ASSETS_DIR = path.join(rootDir, "packaging/macos/dmg");
|
||||||
|
const MAC_DMG_BACKGROUND_PATH = path.join(rootDir, "assets/dmg/background.png");
|
||||||
|
const MAC_DMG_BACKGROUND_RETINA_PATH = path.join(
|
||||||
|
rootDir,
|
||||||
|
"assets/dmg/background@2x.png",
|
||||||
|
);
|
||||||
|
const MAC_DMG_APP_NAME = "Farm Control Server.app";
|
||||||
|
const MAC_DMG_WINDOW_WIDTH = 380;
|
||||||
|
const MAC_DMG_WINDOW_HEIGHT = 540;
|
||||||
|
|
||||||
|
function ensureMacDmgAssets() {
|
||||||
|
mkdirSync(MAC_DMG_ASSETS_DIR, { recursive: true });
|
||||||
|
|
||||||
|
const voliconPath = path.join(MAC_DMG_ASSETS_DIR, "volicon.icns");
|
||||||
|
const iconsetPath = path.join(rootDir, "assets/icon.iconset");
|
||||||
|
|
||||||
|
if (!existsSync(voliconPath) && existsSync(iconsetPath)) {
|
||||||
|
const iconutil = spawnSync(
|
||||||
|
"iconutil",
|
||||||
|
["-c", "icns", "-o", voliconPath, iconsetPath],
|
||||||
|
{ stdio: "inherit" },
|
||||||
|
);
|
||||||
|
|
||||||
|
if (iconutil.status !== 0) {
|
||||||
|
throw new Error(
|
||||||
|
`iconutil failed to create DMG volicon with exit code ${iconutil.status ?? 1}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!existsSync(MAC_DMG_BACKGROUND_PATH)) {
|
||||||
|
throw new Error(`DMG background not found at ${MAC_DMG_BACKGROUND_PATH}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!existsSync(MAC_DMG_BACKGROUND_RETINA_PATH)) {
|
||||||
|
console.warn(
|
||||||
|
`finalize-desktop-artifacts: retina DMG background not found at ${MAC_DMG_BACKGROUND_RETINA_PATH}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
volicon: existsSync(voliconPath) ? voliconPath : null,
|
||||||
|
background: MAC_DMG_BACKGROUND_PATH,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
function findCreateDmgCommand() {
|
function findCreateDmgCommand() {
|
||||||
const which = spawnSync("which", ["create-dmg"], { encoding: "utf8" });
|
const which = spawnSync("which", ["create-dmg"], { encoding: "utf8" });
|
||||||
if (which.status === 0 && which.stdout.trim()) {
|
if (which.status === 0 && which.stdout.trim()) {
|
||||||
@ -207,24 +253,50 @@ function findCreateDmgCommand() {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildMacDmgWithCreateDmg(createDmg, dmgPath, sourceFolder) {
|
function buildMacDmgWithCreateDmg(
|
||||||
rmSync(dmgPath, { force: true });
|
|
||||||
|
|
||||||
const result = spawnSync(
|
|
||||||
createDmg,
|
createDmg,
|
||||||
[
|
|
||||||
"--volname",
|
|
||||||
"Farm Control Server",
|
|
||||||
"--app-drop-link",
|
|
||||||
"480",
|
|
||||||
"170",
|
|
||||||
"--format",
|
|
||||||
"UDZO",
|
|
||||||
dmgPath,
|
dmgPath,
|
||||||
sourceFolder,
|
sourceFolder,
|
||||||
],
|
appBundleName,
|
||||||
{ stdio: "inherit" },
|
dmgAssets,
|
||||||
);
|
) {
|
||||||
|
rmSync(dmgPath, { force: true });
|
||||||
|
|
||||||
|
const args = [
|
||||||
|
"--volname",
|
||||||
|
"Farm Control Server",
|
||||||
|
"--window-pos",
|
||||||
|
"200",
|
||||||
|
"120",
|
||||||
|
"--window-size",
|
||||||
|
String(MAC_DMG_WINDOW_WIDTH),
|
||||||
|
String(MAC_DMG_WINDOW_HEIGHT),
|
||||||
|
"--icon-size",
|
||||||
|
"120",
|
||||||
|
"--icon",
|
||||||
|
appBundleName,
|
||||||
|
"98",
|
||||||
|
"270",
|
||||||
|
"--hide-extension",
|
||||||
|
appBundleName,
|
||||||
|
"--app-drop-link",
|
||||||
|
"282",
|
||||||
|
"270",
|
||||||
|
"--format",
|
||||||
|
"UDZO",
|
||||||
|
];
|
||||||
|
|
||||||
|
if (dmgAssets.volicon) {
|
||||||
|
args.push("--volicon", dmgAssets.volicon);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dmgAssets.background) {
|
||||||
|
args.push("--background", dmgAssets.background);
|
||||||
|
}
|
||||||
|
|
||||||
|
args.push(dmgPath, sourceFolder);
|
||||||
|
|
||||||
|
const result = spawnSync(createDmg, args, { stdio: "inherit" });
|
||||||
|
|
||||||
if (result.status !== 0) {
|
if (result.status !== 0) {
|
||||||
throw new Error(`create-dmg failed with exit code ${result.status ?? 1}`);
|
throw new Error(`create-dmg failed with exit code ${result.status ?? 1}`);
|
||||||
@ -269,6 +341,13 @@ async function buildMacDmg(appBundlePath, arch) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const appBundleName = path.basename(appBundlePath);
|
||||||
|
if (appBundleName !== MAC_DMG_APP_NAME) {
|
||||||
|
console.warn(
|
||||||
|
`finalize-desktop-artifacts: expected ${MAC_DMG_APP_NAME}, found ${appBundleName}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const dmgPath = path.join(
|
const dmgPath = path.join(
|
||||||
artifactDir,
|
artifactDir,
|
||||||
getReleaseArtifactName(version, arch, "dmg"),
|
getReleaseArtifactName(version, arch, "dmg"),
|
||||||
@ -297,9 +376,16 @@ async function buildMacDmg(appBundlePath, arch) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let builtDmgPath;
|
let builtDmgPath;
|
||||||
|
const dmgAssets = ensureMacDmgAssets();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
builtDmgPath = buildMacDmgWithCreateDmg(createDmg, dmgPath, sourceFolder);
|
builtDmgPath = buildMacDmgWithCreateDmg(
|
||||||
|
createDmg,
|
||||||
|
dmgPath,
|
||||||
|
sourceFolder,
|
||||||
|
appBundleName,
|
||||||
|
dmgAssets,
|
||||||
|
);
|
||||||
} finally {
|
} finally {
|
||||||
if (!useDirectSource) {
|
if (!useDirectSource) {
|
||||||
rmSync(stagingDir, { recursive: true, force: true });
|
rmSync(stagingDir, { recursive: true, force: true });
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user