Attempt to bring MacOS workflow back to work. This time building univ…

…ersal binaries (both ARM64 and x86_64)
pawelsalawa · Feb 16, 2025 · cb8d4e7 · cb8d4e7
1 parent 9930ed8
commit cb8d4e7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 48 deletions.
diff --git a/.github/workflows/mac_release.yml b/.github/workflows/mac_release.yml
@@ -487,20 +487,23 @@ jobs:
             - name: Rename portable package
               working-directory: output/SQLiteStudio
               run: |
-                mv sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.dmg sqlitestudio-${{ env.PACKAGE_VERSION }}.dmg
+                mv SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}.dmg sqlitestudio-${{ env.PACKAGE_VERSION }}.dmg
 
             - name: Create installer package
+              working-directory: output/SQLiteStudio
               shell: bash
               env:
                 IB_LICENSE: ${{ secrets.INSTALLER_LICENSE }}
               run: |
                 echo "$IB_LICENSE" > lic.xml
-                hdiutil attach output/SQLiteStudio/sqlitestudio-${{ env.PACKAGE_VERSION }}.dmg
+                # hdiutil attach output/SQLiteStudio/sqlitestudio-${{ env.PACKAGE_VERSION }}.dmg
                 ${{ env.INSTALLBUILDER_DIR }}/bin/builder build SQLiteStudio-installer.xml \
                     --license lic.xml \
                     --setvars project.outputDirectory=$(pwd) \
                     --setvars project.version=${{ env.SQLITESTUDIO_VERSION }}
-                mv SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-osx-installer.dmg SQLiteStudio-${{ env.PACKAGE_VERSION }}-installer.dmg
+                ls -l
+                mv SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-osx-installer.dmg ../../SQLiteStudio-${{ env.PACKAGE_VERSION }}-installer.dmg
+                cd ../../
                 ls -l
 
             - name: SHA256 checksums

diff --git a/Plugins/DbSqliteWx/DbSqliteWx.pro b/Plugins/DbSqliteWx/DbSqliteWx.pro
@@ -28,23 +28,23 @@ isEmpty(WXSQLITE_LIB): {
 }
 
 macx: {
-    exists( /opt/local/include/openssl-3/openssl/crypto.h ) {
-        message( "Configuring OpenSSL from MacPorts" )
-        INCLUDEPATH += /opt/local/include/openssl-3
-        LIBS += -L/opt/local/lib/openssl-3
-    } else {
-        message( "Configuring OpenSSL from HomeBrew" )
-        INCLUDEPATH += /usr/local/opt/openssl/include
-        LIBS += -L/usr/local/opt/openssl/lib
-    }
+    # exists( /opt/local/include/openssl-3/openssl/crypto.h ) {
+    #     message( "Configuring OpenSSL from MacPorts" )
+    #     INCLUDEPATH += /opt/local/include/openssl-3
+    #     LIBS += -L/opt/local/lib/openssl-3
+    # } else {
+    #     message( "Configuring OpenSSL from HomeBrew" )
+    #     INCLUDEPATH += /usr/local/opt/openssl/include
+    #     LIBS += -L/usr/local/opt/openssl/lib
+    # }
     LIBS += -framework Security
 }
 !macx: {
-    LIBS += -L$${PWD}/../deps/lib/$${PLATFORM}/
+    # LIBS += -L$${PWD}/../deps/lib/$${PLATFORM}/
 }
 win32: {
-    INCLUDEPATH += $${PWD}/../deps/include/$${PLATFORM}/
-    DEPENDPATH += $${PWD}/../deps/include/$${PLATFORM}/
+    # INCLUDEPATH += $${PWD}/../deps/include/$${PLATFORM}/
+    # DEPENDPATH += $${PWD}/../deps/include/$${PLATFORM}/
     LIBS += -lcoreSQLiteStudio
 }
 

diff --git a/SQLiteStudio3/create_macosx_bundle.sh b/SQLiteStudio3/create_macosx_bundle.sh
@@ -4,15 +4,12 @@ set -e
 
 printUsage() {
     echo "$0 [-q]... <sqlitestudio build output directory> <qmake path> [dmg|dist|dist_full]"
-    echo "$0 -u <sqlitestudio.x86_64.dmg> <sqlitestudio.arm64.dmg> <sqlitestudio.universal.dmg>"
 }
 
 quiet=0
-universalize=0
 while getopts qu _flag; do
     case "$_flag" in
         q) : $(( quiet += 1 )) ;;
-        u) : $(( universalize += 1 )) ;;
         *) printUsage; exit 1 ;;
     esac
 done
@@ -108,36 +105,6 @@ EOF
     run rm "$_rw_image"
 }
 
-universalize() {
-    _mountpoint1=/Volumes/sqlitestudio-arch1
-    _mountpoint2=/Volumes/sqlitestudio-arch2
-    _device1="$(hdiutil_attach "$1" "$_mountpoint1")"
-    _device2="$(hdiutil_attach "$2" "$_mountpoint2")"
-    rm -fr _universalized
-    cp -RP "$_mountpoint1" _universalized
-    find "$_mountpoint1" -type f \( -perm +u+x -or -name '*.dylib' \) | while read -r _name1; do
-        case "$(file -b "$_name1")" in Mach-O*)
-            _relative_name="${_name1#"$_mountpoint1/"}"
-            run lipo "$_name1" "$_mountpoint2/$_relative_name" -create -output "_universalized/$_relative_name"
-            ;;
-        esac
-    done
-    run hdiutil detach "$_device1"
-    run hdiutil detach "$_device2"
-    cd _universalized
-    codesign_app "SQLiteStudio.app"
-    # shellcheck disable=SC2086
-    pretty_dmg "SQLiteStudio.app" "universal_out" "$BACKGROUND_IMG" $BACKGROUND_RGB
-    cd ..
-    mv "_universalized/universal_out.dmg" "$3"
-    rm -fr _universalized
-}
-
-if [ "$universalize" -gt 0 ] && [ -f "$1" ] && [ -f "$2" ] && [ -n "$3" ]; then
-    universalize "$@"
-    exit
-fi
-
 if [ "$#" -lt 2 ] || [ "$#" -gt 3 ]; then
   printUsage
   exit 1