Skip to content

Rename "install/" to "pkg/" and fix macOS bundling#717

Merged
angela28chen merged 9 commits intogoogle:mainfrom
angela28chen:fix-mac3
Jan 16, 2026
Merged

Rename "install/" to "pkg/" and fix macOS bundling#717
angela28chen merged 9 commits intogoogle:mainfrom
angela28chen:fix-mac3

Conversation

@angela28chen
Copy link
Copy Markdown
Collaborator

Notable changes:

  • Rename install/ to pkg/ and have separate folders within for host tools, device resources, and plugins
  • Change logic for locating resources
    • Remove CMAKE_GENERATED_INSTALL_DIR_PATH and predict the location of different resources relative to the location of the host tool.
    • Split the resolving logic into separate functions that forces the caller to specify which type of resource they are looking for (so that the caller doesn't need knowledge of the layout of resources dir)
    • Using device_resources library to expose related CMAKE_GENERATED_* values, to try and keep fewer libraries regenerated upon SHA changing
  • Fix the mac install/deploy process, moving some processes (macdeployqt, signing, copying of plugin folders and etc.) out of cmake's install stage and into a separate bash script. This is done because cmake's install portion is inflexible (difficult to even add log messages) and it's error-prone to insert blocks of code.
  • Changed BUILD.md to reference scripts rather than repeat their contents

PSAs:

  • Make sure to install with cmake right after building and before running any tests, or Dive might not be able to locate resources
  • dive_profiling_plugin and other external plugins should be copy pasted into pkg/plugins/ now. Best is to do this step when setting up repo & don't delete pkg/plugins while rebuilding

@angela28chen
Copy link
Copy Markdown
Collaborator Author

Should be identical to #690, just using a new PR because the old one seems to be bugged.

@angela28chen angela28chen merged commit 95f35e9 into google:main Jan 16, 2026
42 checks passed
@angela28chen angela28chen deleted the fix-mac3 branch January 26, 2026 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants