From f3342524b90011b74c185eaac5bfc2c278963bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophane=20Mayaud?= Date: Sun, 28 Jan 2024 13:06:41 +0100 Subject: [PATCH] fix(macosbuild): reverting to intel only build temporarily because of many reported crashes --- QtProject/release-build/macos/package.json | 25 +-- ...eo-simili-duplicate-cleaner_macos.pro.user | 173 ++++++++++-------- package.json | 2 + 3 files changed, 115 insertions(+), 85 deletions(-) diff --git a/QtProject/release-build/macos/package.json b/QtProject/release-build/macos/package.json index 03eca08..dbc014c 100644 --- a/QtProject/release-build/macos/package.json +++ b/QtProject/release-build/macos/package.json @@ -1,15 +1,18 @@ { "scripts": { - "qmake": "/Users/theophane/Qt/6.5.3/macos/bin/qmake '../../app/app.pro' -spec macx-clang QMAKE_APPLE_DEVICE_ARCHS='x86_64 arm64' CONFIG+=qtquickcompiler && make qmake_all", - "make": "make -j8", - "macdeploy": "/Users/theophane/Qt/6.5.3/macos/bin/macdeployqt 'Video simili duplicate cleaner.app' -dmg -always-overwrite -appstore-compliant", - "build-mac-binaries": "npm run build-mac && npm run sign-and-package", - "build-mac": "npm run qmake && npm run make && npm run macdeploy", - "sign-and-package": "cp Info.plist 'Video simili duplicate cleaner.app/Contents/Info.plist' && npm run sign-app && npm run package-app", - "sign-app": "codesign --deep --sign 'Apple Distribution: THEOPHANE MAYAUD (XZ4FY5SXW7)' --entitlements parent.plist --options=runtime --timestamp 'Video simili duplicate cleaner.app'", - "package-app": "productbuild --component 'Video simili duplicate cleaner.app' /Applications --sign '3rd Party Mac Developer Installer: THEOPHANE MAYAUD (XZ4FY5SXW7)' --timestamp 'Video simili duplicate cleaner.pkg'", - "make-clean" : "make clean -j8 || exit 0", - "clean-leftovers" : "npm run make-clean && rm -f 'Video simili duplicate cleaner.dmg' && rm -f Makefile && rm -f .qmake.stash && rm -f -r 'Video simili duplicate cleaner.app' && rm -f 'Video simili duplicate cleaner.pkg'", - "clean" : "npm run make-clean && npm run clean-leftovers" + "qmake": "~/Qt/6.5.3/macos/bin/qmake '../../app/app.pro' -spec macx-clang CONFIG+=x86_64 CONFIG+=qtquickcompiler && make qmake_all", + "qmake-arm": "~/Qt/6.5.3/macos/bin/qmake '../../app/app.pro' -spec macx-clang QMAKE_APPLE_DEVICE_ARCHS='x86_64 arm64' CONFIG+=qtquickcompiler && make qmake_all", + "make": "make -j8", + "macdeploy": "~/Qt/6.5.3/macos/bin/macdeployqt 'Video simili duplicate cleaner.app' -dmg -always-overwrite -appstore-compliant", + "build-mac-binaries": "npm run build-mac && npm run sign-and-package", + "build-mac": "npm run qmake && npm run make && npm run macdeploy", + "build-mac-arm-binaries": "npm run build-mac-arm && npm run sign-and-package", + "build-mac-arm": "npm run qmake-arm && npm run make && npm run macdeploy", + "sign-and-package": "cp Info.plist 'Video simili duplicate cleaner.app/Contents/Info.plist' && npm run sign-app && npm run package-app", + "sign-app": "codesign --deep --sign 'Apple Distribution: THEOPHANE MAYAUD (XZ4FY5SXW7)' --entitlements parent.plist --options=runtime --timestamp 'Video simili duplicate cleaner.app'", + "package-app": "productbuild --component 'Video simili duplicate cleaner.app' /Applications --sign '3rd Party Mac Developer Installer: THEOPHANE MAYAUD (XZ4FY5SXW7)' --timestamp 'Video simili duplicate cleaner.pkg'", + "make-clean" : "make clean -j8 || exit 0", + "clean-leftovers" : "npm run make-clean && rm -f 'Video simili duplicate cleaner.dmg' && rm -f Makefile && rm -f .qmake.stash && rm -f -r 'Video simili duplicate cleaner.app' && rm -f 'Video simili duplicate cleaner.pkg'", + "clean" : "npm run make-clean && npm run clean-leftovers" } } diff --git a/QtProject/video-simili-duplicate-cleaner_macos.pro.user b/QtProject/video-simili-duplicate-cleaner_macos.pro.user index 3237deb..5368b25 100644 --- a/QtProject/video-simili-duplicate-cleaner_macos.pro.user +++ b/QtProject/video-simili-duplicate-cleaner_macos.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {2b19e0d0-662a-45d1-9ee0-e3fccbe2bb1e} + {de99adef-fd39-4c8f-88d0-6ad0e8f69867} ProjectExplorer.Project.ActiveTarget @@ -37,6 +37,7 @@ true true 1 + 0 false true false @@ -54,55 +55,29 @@ *.md, *.MD, Makefile false true + true ProjectExplorer.Project.PluginSettings - false + true false - false - false - false + true + true + true true - - Unchecked - Unchecked - Checked - Checked - Checked - Unchecked - Unchecked - Checked - Checked - Unchecked - Checked - Unchecked - Checked - Checked - Checked - Checked - Checked - Checked - Checked - Checked - Checked - Checked - Checked - Checked - + 0 true - - true - Builtin.BuildSystem true true Builtin.DefaultTidyAndClazy 4 + true @@ -114,16 +89,16 @@ ProjectExplorer.Project.Target.0 Desktop - Qt 6.2.4 for macOS - Qt 6.2.4 for macOS - qt.qt6.624.clang_64_kit + Qt 6.5.3 for macOS + Qt 6.5.3 for macOS + qt.qt6.653.clang_64_kit 0 0 0 0 - %{ActiveProject:Path}/builds/Qt_6_2_4_for_macOS-Debug - %{ActiveProject:Path}/builds/Qt_6_2_4_for_macOS-Debug + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/build-video-simili-duplicate-cleaner-Qt_6_5_3_for_macOS-Debug + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/build-video-simili-duplicate-cleaner-Qt_6_5_3_for_macOS-Debug true @@ -136,8 +111,8 @@ Qt4ProjectManager.MakeStep 2 - Build - Build + Compiler + Compiler ProjectExplorer.BuildSteps.Build @@ -147,8 +122,8 @@ clean 1 - Clean - Clean + Nettoyer + Nettoyer ProjectExplorer.BuildSteps.Clean 2 @@ -161,13 +136,13 @@ 2 - %{ActiveProject:Path}/builds/Qt_6_2_4_for_macOS-Release - %{ActiveProject:Path}/builds/Qt_6_2_4_for_macOS-Release + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/build-video-simili-duplicate-cleaner-Qt_6_5_3_for_macOS-Release + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/build-video-simili-duplicate-cleaner-Qt_6_5_3_for_macOS-Release true QtProjectManager.QMakeBuildStep - true + false @@ -175,8 +150,8 @@ Qt4ProjectManager.MakeStep 2 - Build - Build + Compiler + Compiler ProjectExplorer.BuildSteps.Build @@ -186,8 +161,8 @@ clean 1 - Clean - Clean + Nettoyer + Nettoyer ProjectExplorer.BuildSteps.Clean 2 @@ -200,12 +175,54 @@ 0 0 - 2 + + 0 + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/build-video-simili-duplicate-cleaner-Qt_6_5_3_for_macOS-Profile + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/build-video-simili-duplicate-cleaner-Qt_6_5_3_for_macOS-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Compiler + Compiler + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Nettoyer + Nettoyer + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profiler + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 0 - Deploy - Deploy + Déploiement + Déploiement ProjectExplorer.BuildSteps.Deploy 1 @@ -217,66 +234,74 @@ true true + 0 true 2 - Qt4ProjectManager.Qt4RunConfiguration:/Users/theophanemayaud/Dev/Programming videos dupplicates/video-simili-duplicate-cleaner/QtProject/app/app.pro - /Users/theophanemayaud/Dev/Programming videos dupplicates/video-simili-duplicate-cleaner/QtProject/app/app.pro - false + false + + Qt4ProjectManager.Qt4RunConfiguration:/Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/QtProject/app/app.pro + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/QtProject/app/app.pro + false true true - false true - /Users/theophanemayaud/Dev/Programming videos dupplicates/video-simili-duplicate-cleaner/QtProject/builds/Qt_6_2_4_for_macOS-Debug/app/Video simili duplicate cleaner.app/Contents/MacOS + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/build-video-simili-duplicate-cleaner-Qt_6_5_3_for_macOS-Debug/app/Video simili duplicate cleaner.app/Contents/MacOS true true + 0 true 2 - Qt4ProjectManager.Qt4RunConfiguration:/Users/theophanemayaud/Dev/Programming videos dupplicates/video-simili-duplicate-cleaner/QtProject/tests/test_mainwindow/test_mainwindow.pro - /Users/theophanemayaud/Dev/Programming videos dupplicates/video-simili-duplicate-cleaner/QtProject/tests/test_mainwindow/test_mainwindow.pro - false + false + + Qt4ProjectManager.Qt4RunConfiguration:/Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/QtProject/tests/test_comparison/test_comparison.pro + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/QtProject/tests/test_comparison/test_comparison.pro + false true true - false true - /Users/theophanemayaud/Dev/Programming videos dupplicates/video-simili-duplicate-cleaner/QtProject/builds/Qt_6_2_4_for_macOS-Debug/tests/test_mainwindow/test_mainwindow.app/Contents/MacOS + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/build-video-simili-duplicate-cleaner-Qt_6_5_3_for_macOS-Debug/tests/test_comparison/Video simili duplicate cleaner.app/Contents/MacOS true true + 0 true 2 - Qt4ProjectManager.Qt4RunConfiguration:/Users/theophanemayaud/Dev/Programming videos dupplicates/video-simili-duplicate-cleaner/QtProject/tests/test_video/test_video.pro - /Users/theophanemayaud/Dev/Programming videos dupplicates/video-simili-duplicate-cleaner/QtProject/tests/test_video/test_video.pro - false + false + + Qt4ProjectManager.Qt4RunConfiguration:/Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/QtProject/tests/test_mainwindow/test_mainwindow.pro + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/QtProject/tests/test_mainwindow/test_mainwindow.pro + false true true - false true - /Users/theophanemayaud/Dev/Programming videos dupplicates/video-simili-duplicate-cleaner/QtProject/builds/Qt_6_2_4_for_macOS-Debug/tests/test_video/Video simili duplicate cleaner.app/Contents/MacOS + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/build-video-simili-duplicate-cleaner-Qt_6_5_3_for_macOS-Debug/tests/test_mainwindow/test_mainwindow.app/Contents/MacOS true true + 0 true 2 - Qt4ProjectManager.Qt4RunConfiguration:/Users/theophanemayaud/Dev/Programming videos dupplicates/video-simili-duplicate-cleaner/QtProject/tests/test_comparison/test_comparison.pro - /Users/theophanemayaud/Dev/Programming videos dupplicates/video-simili-duplicate-cleaner/QtProject/tests/test_comparison/test_comparison.pro - false + false + + Qt4ProjectManager.Qt4RunConfiguration:/Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/QtProject/tests/test_video/test_video.pro + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/QtProject/tests/test_video/test_video.pro + false true true - false true - /Users/theophanemayaud/Dev/Programming videos dupplicates/video-simili-duplicate-cleaner/QtProject/builds/Qt_6_2_4_for_macOS-Debug/tests/test_comparison/Video simili duplicate cleaner.app/Contents/MacOS + /Users/theophanemayaud/Dev/video-simili-duplicate-cleaner/build-video-simili-duplicate-cleaner-Qt_6_5_3_for_macOS-Debug/tests/test_video/Video simili duplicate cleaner.app/Contents/MacOS 4 diff --git a/package.json b/package.json index d16fef0..9b579b6 100644 --- a/package.json +++ b/package.json @@ -32,9 +32,11 @@ "notif-push": "echo '\n\n Remember to push commits and tags with \n git push && git push --tags' ", "update-build-version": "node -p -e \"require('./package.json').version\" > ./QtProject/app/version.txt && node update-plist-version.js && node update-appxmanifest-version.js", "build": "npm run update-build-version && npm run build-mac-binaries --prefix QtProject/release-build/macos", + "build-arm": "npm run update-build-version && npm run build-mac-arm-binaries --prefix QtProject/release-build/macos", "clean": "npm run clean --prefix QtProject/release-build/macos", "copy-binaries": "cp 'QtProject/release-build/macos/Video simili duplicate cleaner.dmg' '../Video simili duplicate cleaner.dmg' && cp -R 'QtProject/release-build/macos/Video simili duplicate cleaner.app' '../' & cp 'QtProject/release-build/macos/Video simili duplicate cleaner.pkg' '../Video simili duplicate cleaner.pkg'", "binaries": "npm run kill-app && npm run delete-binaries && npm run clean && npm run build && npm run copy-binaries && npm run clean", + "binaries-arm": "npm run kill-app && npm run delete-binaries && npm run clean && npm run build-arm && npm run copy-binaries && npm run clean", "manual-binaries": "npm run binaries && npm run add-receit", "delete-binaries": "(rm -r '../Video simili duplicate cleaner.app' || exit 0) && (rm -r '../Video simili duplicate cleaner.dmg' || exit 0) && (rm -r '../Video simili duplicate cleaner.pkg' || exit 0)", "add-receit": "cp -r 'QtProject/release-build/macos/_MASReceipt' '../Video simili duplicate cleaner.app/Contents'",