Skip to content

Bump v340rc2#499

Merged
jmarrec merged 11 commits intodevelopfrom
bump_v340rc1
May 2, 2022
Merged

Bump v340rc2#499
jmarrec merged 11 commits intodevelopfrom
bump_v340rc1

Conversation

@macumber
Copy link
Copy Markdown
Collaborator

Creating a draft PR so @j-lorrey can follow along on the process of a version bump

@jmarrec jmarrec changed the title Bump v340rc1 Bump v340rc2 Apr 26, 2022
@jmarrec jmarrec marked this pull request as ready for review April 26, 2022 11:27
@jmarrec
Copy link
Copy Markdown
Collaborator

jmarrec commented Apr 26, 2022

I got it to build, but there problems with the mac bundle related to the Geometry editor (at least on M1 macs). I also updated to Qt 6.3.0 and OpenStudio 3.4.0-rc2

dyld[55072]: Library not loaded: @executable_path/../Frameworks/QtWebEngineCore.framework/Versions/A/QtWebEngineCore
  Referenced from: /Users/julien/Software/Others/OSApp-build-release/_CPack_Packages/Darwin/TGZ/OpenStudioApplication-1.4.0--rc1+518ddb96cf-macOS12.1-arm64/OpenStudioApp.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess
  Reason: tried: '/Users/julien/Software/Others/OSApp-build-release/_CPack_Packages/Darwin/TGZ/OpenStudioApplication-1.4.0--rc1+518ddb96cf-macOS12.1-arm64/OpenStudioApp.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app/Contents/MacOS/../Frameworks/QtWebEngineCore.framework/Versions/A/QtWebEngineCore' (no such file), '/Library/Frameworks/QtWebEngineCore.framework/Versions/A/QtWebEngineCore' (no such file), '/System/Library/Frameworks/QtWebEngineCore.framework/Versions/A/QtWebEngineCore' (no such file)
dyld[55074]: Library not loaded: @executable_path/../Frameworks/QtWebEngineCore.framework/Versions/A/QtWebEngineCore
  Referenced from: /Users/julien/Software/Others/OSApp-build-release/_CPack_Packages/Darwin/TGZ/OpenStudioApplication-1.4.0--rc1+518ddb96cf-macOS12.1-arm64/OpenStudioApp.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess
  Reason: tried: '/Users/julien/Software/Others/OSApp-build-release/_CPack_Packages/Darwin/TGZ/OpenStudioApplication-1.4.0--rc1+518ddb96cf-macOS12.1-arm64/OpenStudioApp.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app/Contents/MacOS/../Frameworks/QtWebEngineCore.framework/Versions/A/QtWebEngineCore' (no such file), '/Library/Frameworks/QtWebEngineCore.framework/Versions/A/QtWebEngineCore' (no such file), '/System/Library/Frameworks/QtWebEngineCore.framework/Versions/A/QtWebEngineCore' (no such file)

@macumber
Copy link
Copy Markdown
Collaborator Author

Fixes #505

@macumber
Copy link
Copy Markdown
Collaborator Author

I'm not much help on the M1 stuff until I get ahold of one myself. Does the file referenced exist? Is it built with the right architecture?

@jmarrec
Copy link
Copy Markdown
Collaborator

jmarrec commented Apr 29, 2022

@macumber My guess is that the exact same issue happens on non M1 macs. Yes the file exists, it's just the RPATH stuff that's not right.

$ otool -l /Users/julien/Qt/6.3.0/macos/lib/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess > ori.txt

$ otool -l /Users/julien/Software/Others/OSApp-build-release/_CPack_Packages/Darwin/TGZ/OpenStudioApplication-1.4.0-rc1+32ca81a498-macOS12.1-arm64/OpenStudioApp.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess > new.txt 

image (5)

@macumber
Copy link
Copy Markdown
Collaborator Author

Ok if it’s just a qt change I could look at that

@macumber
Copy link
Copy Markdown
Collaborator Author

macumber commented Apr 30, 2022

I just built this branch on my x86 Mac and did not have this issue. Did you try building the IFW installer and installing that? Or were you trying to run the app out of your build dir?

Edit: I built the TGZ package and tried to run the app from inside the package contents and did see this error. However, I did not have this issue when I installed the IFW installer and then double clicked on the app.

@macumber
Copy link
Copy Markdown
Collaborator Author

macumber commented May 1, 2022

This seems to be the magic that is created during the IFW install (I don't know where this happens)

If IFW build directory:

mymac@MacBook-Pro-2 Darwin % ls -alsh IFW/OpenStudioApplication-1.3.1+28a7380963-macOS10.15-x86_64/packages/OpenStudioApp/data/OpenStudioApp.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app/Contents/     
total 8
0 drwxrwxr-x  5 mymac  staff   160B Apr 30 15:55 .
0 drwxrwxr-x  3 mymac  staff    96B Apr 30 15:55 ..
8 -rw-r--r--  1 mymac  staff   973B Apr  5 17:43 Info.plist
0 drwxrwxr-x  4 mymac  staff   128B Apr 30 15:55 MacOS
0 drwxrwxrwx  3 mymac  staff    96B Apr 30 15:55 Resources

In IFW installed directory there is a symlink to the top level Frameworks dir:

mymac@MacBook-Pro-2 OpenStudioApplication-1.3.1 % ls -alsh OpenStudioApp.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app/Contents/
total 8
0 drwxrwxr-x  6 mymac  admin   192B Apr 30 16:21 .
0 drwxrwxr-x  3 mymac  admin    96B Apr 30 16:21 ..
0 lrwxr-xr-x  1 root   admin    31B Apr 30 16:21 Frameworks -> ../../../../../../../Frameworks
8 -rw-r--r--  1 mymac  admin   973B Apr  5 17:43 Info.plist
0 drwxrwxr-x  4 mymac  admin   128B Apr 30 16:21 MacOS
0 drwxrwxrwx  3 mymac  admin    96B Apr 30 16:21 Resources

Maybe something in IFW installer goes through and adds symlinks to top level Frameworks dir to all child app dirs?

Edit: never mind I think it happens here https://github.com/openstudiocoalition/OpenStudioApplication/blob/7078341fc4628ae5746c093c898fb97901d00b6a/src/openstudio_app/install_operations.qs

@jmarrec
Copy link
Copy Markdown
Collaborator

jmarrec commented May 1, 2022

yes, that symlink is created here:

var linktarget = "@TargetDir@/OpenStudioApp.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app/Contents/Frameworks";
var linksource = "../../../../../../../Frameworks";
component.addElevatedOperation("Execute", "ln", "-s", linksource, linktarget);

The IFW does work on M1 too!

I know the build dir Products/OpenStudioApp doesn't work on mac (and it's probably too annoying to fix). I think I may have been testing the build_dir/_CPack and the tar.gz installer, not the IFW one.

I think we should cmake install that symlink instead of having it in the install_operations.qs so that the tar.gz installer works too.

@macumber macumber mentioned this pull request May 1, 2022
@jmarrec
Copy link
Copy Markdown
Collaborator

jmarrec commented May 1, 2022

@macumber I moved the symlink Frameworks for QtWebengine to CMakeLists.txt so that the TGZ installer works. Let's merge this one in. I'll let CI go through first.

@jmarrec
Copy link
Copy Markdown
Collaborator

jmarrec commented May 1, 2022

@macumber The TGZ still doesn't work, because only the QtIFW does that (which is nuts... we copy so much heavy stuff around):

// This is equivalent to mkdir -p, will make any directory in between, no
// override if it exists already. You DO need the trailing slash, as it
// takes sections up to net trailing slash to create directories...
component.addElevatedOperation("Mkdir", "@TargetDir@/OpenStudioApp.app/Contents/EnergyPlus/");
// Copies the content of ./EnergyPlus/* into /OpenStudioApp.app/Contents/EnergyPlus/*
// Be VERY mindful of the trailing slashes... This behaves very weirdly
// Source doesn't not include trailing, so it's the directory itself
// Target does include trailing, so it's within that directory
component.addElevatedOperation("CopyDirectory", "@TargetDir@/EnergyPlus", "@TargetDir@/OpenStudioApp.app/Contents/");
// Same ./Radiance/* to OpenStudioApp.app/Contents/Radiance/*
component.addElevatedOperation("Mkdir", "@TargetDir@/OpenStudioApp.app/Contents/Radiance/");
component.addElevatedOperation("CopyDirectory", "@TargetDir@/Radiance", "@TargetDir@/OpenStudioApp.app/Contents/");

@macumber
Copy link
Copy Markdown
Collaborator Author

macumber commented May 1, 2022

Maybe it's best to move db7741b to a separate PR for #512 ?

@jmarrec jmarrec merged commit b286ab8 into develop May 2, 2022
@jmarrec jmarrec deleted the bump_v340rc1 branch May 2, 2022 07:03
@github-actions github-actions bot locked and limited conversation to collaborators May 2, 2022
@jmarrec
Copy link
Copy Markdown
Collaborator

jmarrec commented May 2, 2022

I moved the commit to the 512_TGZ_mac_installer. I'm merging this one, I need it to review #496

@macumber
Copy link
Copy Markdown
Collaborator Author

macumber commented May 2, 2022

Sounds good!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants