Skip to content
Snippets Groups Projects

Migrate to pyenv Python Platform; Fix MacOS package (Major change)

Merged Ammar Nejati requested to merge fixMacPackage into r21.1

The major change to the packaging script is meant to repair and improve the packaging mechanism for MacOS. The MacOS package was broken due to the new dependencies of the Qt libraries and the migration to pyenv platform.

The packaging script, devtools/deploy/mac/mac_package.py, is fully re-written in Python for clarity, as shell scripting was not suitable for such a complicated task. In essence, the script follows the rules explained in man dyld (1). Furthermore, it uses MacOS native tools otool and install_name_tool to adjust the binaries.

The script finds the dependencies of the core libraries up to a maximum level. The dependencies are then copied to the corresponding package directories, and library references and RPATHs are modified accordingly.

The Python platform for building will be pyenv (on Windows: pyenv-win).

Edited by Ammar Nejati

Merge request reports

Pipeline #114409 passed

Pipeline passed for 4cc4e935 on fixMacPackage

Approved by

Merged by Ammar NejatiAmmar Nejati 1 year ago (Oct 10, 2023 10:10am UTC)

Merge details

  • Changes merged into r21.1 with 430b90ab.
  • Deleted the source branch.

Pipeline #114410 passed

Pipeline passed for 430b90ab on r21.1

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • a short first round of comments and questions

  • Ammar Nejati changed the description

    changed the description

  • Ammar Nejati added 62 commits

    added 62 commits

    • 213492fd...b2307511 - 52 earlier commits
    • f8b814bf - FixPack.cmake: use mac_package.py
    • cea9648b - App/CMakeLists.txt: correct MacOS package macro variables
    • 077252cb - CMake: add 'BornAgain_LIBRARIES' cached variable to store paths to BornAgain core libraries
    • f5f0ca9a - <root>/CMakeLists.txt: add 'BornAgain_LIBRARIES' cached variable to store...
    • 4627d515 - mac_package: major improvements
    • 5a04ce88 - mac_package.py: improve documentation
    • 14c5cf68 - rm unneeded devtools/deploy/mac/mk_mac_package.py
    • 15d927e3 - rm unneeded devtools/deploy/mac/shutils.py
    • 21e5a9a3 - rm unneeded devtools/deploy/mac/adjust_mac_bundle.zsh.in
    • 667d33e5 - GitLab-CI: Use pyenv platform

    Compare with previous version

  • Ammar Nejati added 6 commits

    added 6 commits

    • d548cf0b - mac_package: major improvements
    • 122b0f81 - mac_package.py: improve documentation
    • 860ee51c - rm unneeded devtools/deploy/mac/mk_mac_package.py
    • 5e74ec1f - rm unneeded devtools/deploy/mac/shutils.py
    • 4105f9f3 - rm unneeded devtools/deploy/mac/adjust_mac_bundle.zsh.in
    • 3e3e22bb - GitLab-CI: Use pyenv platform

    Compare with previous version

  • Ammar Nejati added 6 commits

    added 6 commits

    • 2b85fc08 - mac_package.py: improve documentation
    • abea93ac - rm unneeded devtools/deploy/mac/mk_mac_package.py
    • a917e7df - rm unneeded devtools/deploy/mac/shutils.py
    • 2535c113 - rm unneeded devtools/deploy/mac/adjust_mac_bundle.zsh.in
    • 880cf79d - GitLab-CI: Use pyenv platform
    • e16b0264 - rename devtools/deploy/mac/mac_package.py => mac_package.py.in

    Compare with previous version

  • Ammar Nejati changed target branch from main to r21.1

    changed target branch from main to r21.1

  • Ammar Nejati resolved all threads

    resolved all threads

  • Wuttke, Joachim resolved all threads

    resolved all threads

  • Ammar Nejati added 1 commit

    added 1 commit

    • 23eb0130 - rename devtools/deploy/mac/mac_package.py => mac_package.py.in

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading