Skip to content

Commit

Permalink
fix: osx builds to allow nwjs launch (#717)
Browse files Browse the repository at this point in the history 
Signed-off-by: Brian Bothwell <[email protected]>
  • Loading branch information
@sysrage
sysrage authored Nov 27, 2022
1 parent 1a49aeb commit aa38a56
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 81 deletions.
118 changes: 39 additions & 79 deletions src/bld/osxCfg.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import fs from "node:fs/promises";
import path from "node:path";

import plist from "plist";

Expand All @@ -9,89 +10,48 @@ import plist from "plist";
* @param {string} outDir The directory to hold build artifacts
* @param {object} releaseInfo NW binary release metadata
*/
const setOsxConfig = async (pkg, outDir, releaseInfo) => {
await fs.rename(`${outDir}/nwjs.app`, `${outDir}/${pkg.name}.app`);
const setOsxConfig = async (pkg, outDir) => {
// const setOsxConfig = async (pkg, outDir, releaseInfo) => {
const outApp = path.resolve(outDir, `${pkg.name}.app`);
await fs.rename(path.resolve(outDir, "nwjs.app"), outApp);

// Rename CFBundleDisplayName in Contents/Info.plist
let contents_info_plist_path = `${outDir}/${pkg.name}.app/Contents/Info.plist`;
let contents_info_plist_json = plist.parse(
await fs.readFile(contents_info_plist_path, "utf-8"),
);
contents_info_plist_json.CFBundleDisplayName = pkg.name;
let contents_info_plist = plist.build(contents_info_plist_json);
await fs.writeFile(contents_info_plist_path, contents_info_plist);
const contentsInfoPlistPath = path.resolve(outApp, "Contents/Info.plist");
const contentsInfoPlistJson = plist.parse(await fs.readFile(contentsInfoPlistPath, "utf-8"));
contentsInfoPlistJson.CFBundleDisplayName = pkg.name;
const contentsInfoPlist = plist.build(contentsInfoPlistJson);
await fs.writeFile(contentsInfoPlistPath, contentsInfoPlist);

// Rename CFBundleDisplayName in Contents/Resources/en.lproj/InfoPlist.strings

// Rename Helper apps in Contents/Framework.framework/Versions/n.n.n.n/Helpers
let helper_app_path_alerts = (name = "nwjs") =>
`${outDir}/${pkg.name}.app/Contents/Frameworks/nwjs Framework.framework/Versions/${releaseInfo.components.chromium}/Helpers/${name} Helper (Alerts).app`;
let helper_app_path_gpu = (name = "nwjs") =>
`${outDir}/${pkg.name}.app/Contents/Frameworks/nwjs Framework.framework/Versions/${releaseInfo.components.chromium}/Helpers/${name} Helper (GPU).app`;
let helper_app_path_plugin = (name = "nwjs") =>
`${outDir}/${pkg.name}.app/Contents/Frameworks/nwjs Framework.framework/Versions/${releaseInfo.components.chromium}/Helpers/${name} Helper (Plugin).app`;
let helper_app_path_renderer = (name = "nwjs") =>
`${outDir}/${pkg.name}.app/Contents/Frameworks/nwjs Framework.framework/Versions/${releaseInfo.components.chromium}/Helpers/${name} Helper (Renderer).app`;
let helper_app_path = (name = "nwjs") =>
`${outDir}/${pkg.name}.app/Contents/Frameworks/nwjs Framework.framework/Versions/${releaseInfo.components.chromium}/Helpers/${name} Helper.app`;
await fs.rename(helper_app_path_alerts(), helper_app_path_alerts(pkg.name));
await fs.rename(helper_app_path_gpu(), helper_app_path_gpu(pkg.name));
await fs.rename(helper_app_path_plugin(), helper_app_path_plugin(pkg.name));
await fs.rename(
helper_app_path_renderer(),
helper_app_path_renderer(pkg.name),
);
await fs.rename(helper_app_path(), helper_app_path(pkg.name));

let helper_app_alerts_plist_path = `${helper_app_path_alerts(
pkg.name,
)}/Contents/Info.plist`;
let helper_app_gpu_plist_path = `${helper_app_path_gpu(
pkg.name,
)}/Contents/Info.plist`;
let helper_app_plugin_plist_path = `${helper_app_path_plugin(
pkg.name,
)}/Contents/Info.plist`;
let helper_app_render_plist_path = `${helper_app_path_renderer(
pkg.name,
)}/Contents/Info.plist`;
let helper_app_plist_path = `${helper_app_path(
pkg.name,
)}/Contents/Info.plist`;

let helper_app_alerts_plist_json = plist.parse(
await fs.readFile(helper_app_alerts_plist_path, "utf-8"),
);
let helper_app_gpu_plist_json = plist.parse(
await fs.readFile(helper_app_gpu_plist_path, "utf-8"),
);
let helper_app_plugin_plist_json = plist.parse(
await fs.readFile(helper_app_plugin_plist_path, "utf-8"),
);
let helper_app_render_plist_json = plist.parse(
await fs.readFile(helper_app_render_plist_path, "utf-8"),
);
let helper_app_plist_json = plist.parse(
await fs.readFile(helper_app_plist_path, "utf-8"),
);

helper_app_alerts_plist_json.CFBundleDisplayName = pkg.name;
helper_app_gpu_plist_json.CFBundleDisplayName = pkg.name;
helper_app_render_plist_json.CFBundleDisplayName = pkg.name;
helper_app_plugin_plist_json.CFBundleDisplayName = pkg.name;
helper_app_plist_json.CFBundleDisplayName = pkg.name;

let helper_app_alerts_plist = plist.build(helper_app_alerts_plist_json);
let helper_app_gpu_plist = plist.build(helper_app_gpu_plist_json);
let helper_app_render_plist = plist.build(helper_app_render_plist_json);
let helper_app_plugin_plist = plist.build(helper_app_plugin_plist_json);
let helper_app_plist = plist.build(helper_app_plist_json);

await fs.writeFile(helper_app_alerts_plist_path, helper_app_alerts_plist);
await fs.writeFile(helper_app_gpu_plist_path, helper_app_gpu_plist);
await fs.writeFile(helper_app_plugin_plist_path, helper_app_plugin_plist);
await fs.writeFile(helper_app_render_plist_path, helper_app_render_plist);
await fs.writeFile(helper_app_plist_path, helper_app_plist);
const contentsInfoPlistStringsPath = path.resolve(outApp, "Contents/Resources/en.lproj/InfoPlist.strings");
const contentsInfoPlistStrings = await fs.readFile(contentsInfoPlistStringsPath, "utf-8");
const newPlistStrings = contentsInfoPlistStrings.replace(/CFBundleGetInfoString = "nwjs /, `CFBundleGetInfoString = "${pkg.name} `);
await fs.writeFile(contentsInfoPlistStringsPath, newPlistStrings);

// Add product_string property to package.json
// const packageJsonPath = path.resolve(outApp, "Contents/Resources/app.nw/package.json");
// pkg.product_string = pkg.name;
// await fs.writeFile(packageJsonPath, JSON.stringify(pkg, null, 4));

// Update Helper apps
// TODO: determine why this prevents app from launching
// for (const helperName of [" (Alerts)", " (GPU)", " (Plugin)", " (Renderer)", ""]) {
// const helperPath = (name = "nwjs") => path.resolve(
// outApp,
// `Contents/Frameworks/nwjs Framework.framework/Versions/${releaseInfo.components.chromium}/Helpers/`,
// `${name} Helper${helperName}.app`
// );

// // Rename Helper apps in Contents/Framework.framework/Versions/n.n.n.n/Helpers
// await fs.rename(helperPath(), helperPath(pkg.name));

// // Update Helper app Info.plist files in Contents/Framework.framework/Versions/n.n.n.n/Helpers
// const helperPlistPath = path.resolve(helperPath(pkg.name), "Contents/Info.plist");
// const helperPlistJson = plist.parse(await fs.readFile(helperPlistPath, "utf-8"));
// helperPlistJson.CFBundleDisplayName = pkg.name;
// const helperPlist = plist.build(helperPlistJson);
// await fs.writeFile(helperPlistPath, helperPlist);
// }
};

export { setOsxConfig };
4 changes: 2 additions & 2 deletions src/bld/package.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const packager = async (srcDir, nwDir, outDir, platform, zip, releaseInfo) => {
await cp(
srcDir,
`${outDir}/${
platform !== "osx" ? "package.nw" : "nwjs.app/Contents/Resources/nw.app"
platform !== "osx" ? "package.nw" : "nwjs.app/Contents/Resources/app.nw"
}`,
{
recursive: true,
Expand All @@ -37,7 +37,7 @@ const packager = async (srcDir, nwDir, outDir, platform, zip, releaseInfo) => {
log.debug("Get NW's package.json as a buffer");
let buffer = await readFile(
`${outDir}/${
platform !== "osx" ? "package.nw" : "nwjs.app/Contents/Resources/nw.app"
platform !== "osx" ? "package.nw" : "nwjs.app/Contents/Resources/app.nw"
}/package.json`,
);
log.debug("Convert package.json buffer into JSON");
Expand Down

0 comments on commit aa38a56

Please sign in to comment.