From 5590af309fd9f78e4642f01833e26bbcf343d145 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Thu, 11 Jul 2024 17:31:28 +0800 Subject: We're back to `make install` for macOS `cpack -G Bundle` just wouldn't play along well with code-signing and also broke Dullahan/CEF. The creation of the link to Applications in the AppleScript is now needed since we don't rely on CPack to make it for us any more. --- README.md | 7 +++---- indra/newview/installers/darwin/dmg-cleanup.applescript | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 306f4cee0b..7632d81bb3 100644 --- a/README.md +++ b/README.md @@ -116,12 +116,11 @@ $ cd /opt/local/include $ sudo curl -OL https://raw.githubusercontent.com/DLTcollab/sse2neon/master/sse2neon.h $ cd - $ export LL_BUILD="-O3 -gdwarf-2 -stdlib=libc++ -iwithsysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -std=c++17 -fPIC -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG -DPIC -DLL_DARWIN=1" -$ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES:STRING="arm64;x86_64" -DADDRESS_SIZE:INTERNAL=64 -DUSESYSTEMLIBS:BOOL=ON -DUSE_OPENAL:BOOL=ON -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=OFF -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=ON ../../indra +$ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=newview/$project.app/Contents/Resources -DCMAKE_OSX_ARCHITECTURES:STRING="arm64;x86_64" -DADDRESS_SIZE:INTERNAL=64 -DUSESYSTEMLIBS:BOOL=ON -DUSE_OPENAL:BOOL=ON -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=OFF -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=OFF ../../indra $ cmake ../../indra $ make -j`gnproc` -$ cpack -G Bundle -$ open Megapahit-`cat newview/viewer_version.txt`-`uname -s`.dmg -$ open /Volumes/Megapahit\ Installer +$ make install +$ open newview/Megapahit.app ``` ### GNU/Linux diff --git a/indra/newview/installers/darwin/dmg-cleanup.applescript b/indra/newview/installers/darwin/dmg-cleanup.applescript index b5abc3a730..866bf31e8f 100755 --- a/indra/newview/installers/darwin/dmg-cleanup.applescript +++ b/indra/newview/installers/darwin/dmg-cleanup.applescript @@ -36,6 +36,7 @@ tell application "Finder" set arrangement of theViewOptions to not arranged set icon size of theViewOptions to 128 set background picture of theViewOptions to file ".background:background.jpg" + make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"} set position of item "Megapahit" of container window to {125, 160} set position of item "Applications" of container window to {375, 160} update without registering applications -- cgit v1.2.3