macos: move dylib fixer into a dedicated script

mcallegari · Jan 11, 2025 · 11be8bc · 11be8bc
1 parent c92b453
commit 11be8bc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 38 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -533,6 +533,7 @@ jobs:
           echo "GIT_REV=`git rev-parse --short HEAD`" >> $GITHUB_ENV
           echo "QTDIR=${{ github.workspace }}/qt/Qt/${{ env.QT_VERSION }}/clang_64" >> $GITHUB_ENV
           echo "NPROC=`sysctl -n hw.ncpu`" >> $GITHUB_ENV
+          echo "HOMEBREW_PREFIX=${{ env.HOMEBREW_PREFIX }}" >> $GITHUB_ENV
 
       - name: Print ENV vars
         shell: bash
@@ -580,24 +581,8 @@ jobs:
 
       - name: Fix non-Qt dependencies
         shell: bash
-        run: |
-          fix_dep () {
-            echo "Processing \$1..."
-            for dep in `otool -L \$1 | grep opt | cut -d ' ' -f 1`
-            do
-              if [[ "\$dep" == *\$HOMEBREW_PREFIX* ]]; then
-                subst=\${dep##*/}
-                echo "Regular lib: \$dep (\$subst)"
-                # check missing dependency
-                if [ ! -f ~/QLC+.app/Contents/Frameworks/\$subst ]; then
-                  echo "Dependency missing: \$subst. Adding it to target..."
-                  cp \$dep ~/QLC+.app/Contents/Frameworks/
-                fi
-                install_name_tool -change \$dep @executable_path/../Frameworks/\$subst \$1
-              fi
-            done
-          }
-          fix_dep ~/QLC+.app/Contents/Frameworks/libsndfile.1.dylib
+        run: |-
+          platforms/macos/fix_dylib_deps.sh ~/QLC+.app/Contents/Frameworks/libsndfile.1.dylib
 
       - name: Run macosdeploy
         shell: bash

diff --git a/create-dmg-cmake.sh b/create-dmg-cmake.sh
@@ -36,26 +36,7 @@ fi
 cd ..
 
 echo "Fix non-Qt dependencies..."
-
-fix_dep () {
-    echo "Processing $1..."
-    for dep in `otool -L $1 | grep opt | cut -d ' ' -f 1`
-    do
-        if [[ "$dep" == *$HOMEBREW_PREFIX* ]]; then
-            subst=${dep##*/}
-            echo "Regular lib: $dep ($subst)"
-            # check missing dependency
-            if [ ! -f ~/QLC+.app/Contents/Frameworks/$subst ]; then
-                echo "Dependency missing: $subst. Adding it to target..."
-                cp $dep ~/QLC+.app/Contents/Frameworks/
-            fi
-            #install_name_tool -id @executable_path/../Frameworks/$subst $1
-            install_name_tool -change $dep @executable_path/../Frameworks/$subst $1
-        fi
-    done
-}
-
-fix_dep ~/QLC+.app/Contents/Frameworks/libsndfile.1.dylib
+platforms/macos/fix_dylib_deps.sh ~/QLC+.app/Contents/Frameworks/libsndfile.1.dylib
 
 echo "Run macdeployqt..."
 $QTDIR/bin/macdeployqt ~/QLC+.app

diff --git a/platforms/macos/fix_dylib_deps.sh b/platforms/macos/fix_dylib_deps.sh
@@ -0,0 +1,15 @@
+echo "Processing $1..."
+for dep in `otool -L $1 | grep opt | cut -d ' ' -f 1`
+do
+    if [[ "$dep" == *$HOMEBREW_PREFIX* ]]; then
+        subst=${dep##*/}
+        echo "Regular lib: $dep ($subst)"
+        # check missing dependency
+        if [ ! -f ~/QLC+.app/Contents/Frameworks/$subst ]; then
+            echo "Dependency missing: $subst. Adding it to target..."
+            cp $dep ~/QLC+.app/Contents/Frameworks/
+        fi
+
+        install_name_tool -change $dep @executable_path/../Frameworks/$subst $1
+    fi
+done