Skip to content

Commit

Permalink
#510 - Part 1 - Move dyllibs to Frameworks folder (#529)
Browse files Browse the repository at this point in the history
* Move dyllibs to 'Frameworks' directory per MacOS bundle guidelines

* Set inner installation path of libraries

* No longer need to special case the dylibs; since they are in the expected bundle location
  • Loading branch information
bryphe authored Aug 1, 2019
1 parent 2c8b24f commit 64c9982
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 0 additions & 3 deletions scripts/osx/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ else
echo "Checking identities..."

security find-identity -v
# Need to sign the dylib files directly, as they aren't
# picked up by --deep
codesign --force --verbose --sign "Outrun Labs, LLC" _release/Onivim2.App/Contents/libs/*.dylib

echo "Starting codesign..."
codesign --deep --force --verbose --sign "Outrun Labs, LLC" _release/Onivim2.App
Expand Down
6 changes: 3 additions & 3 deletions scripts/release.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ if (process.platform == "linux") {
const contentsDirectory = path.join(appDirectory, "Contents");
const resourcesDirectory = path.join(contentsDirectory, "Resources");
const binaryDirectory = path.join(contentsDirectory, "MacOS");
const libsDirectory = path.join(contentsDirectory, "libs");
const frameworksDirectory = path.join(contentsDirectory, "Frameworks");

const imageSourceDirectory = path.join(rootDirectory, "assets", "images");
const iconSourcePath = path.join(imageSourceDirectory, "Onivim2.icns");
Expand All @@ -93,7 +93,7 @@ if (process.platform == "linux") {
NSHighResolutionCapable: true,
};

fs.mkdirpSync(libsDirectory);
fs.mkdirpSync(frameworksDirectory);
fs.mkdirpSync(resourcesDirectory);

fs.writeFileSync(plistFile, require("plist").build(plistContents));
Expand All @@ -112,7 +112,7 @@ if (process.platform == "linux") {
// Copy icon
copy(iconSourcePath, path.join(resourcesDirectory, "Onivim2.icns"));

shell(`dylibbundler -b -x "${path.join(binaryDirectory, "Oni2_editor")}" -d "${libsDirectory}" -cd`);
shell(`dylibbundler -b -x "${path.join(binaryDirectory, "Oni2_editor")}" -d "${frameworksDirectory}" -p "@executable_path/../Frameworks/" -cd`);

const dmgPath = path.join(releaseDirectory, "Onivim2.dmg");
const dmgJsonPath = path.join(releaseDirectory, "appdmg.json");
Expand Down

0 comments on commit 64c9982

Please sign in to comment.