wip

benma · Oct 30, 2024 · 4a8c923 · 4a8c923
1 parent df0909d
commit 4a8c923
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/frontends/qt/Makefile b/frontends/qt/Makefile
@@ -14,6 +14,8 @@
 
 include ../../env.mk.inc
 
+export PATH := $(PATH)
+
 base:
 	mkdir build
 	./genassets.sh
@@ -43,9 +45,14 @@ linux:
 	cd build/linux-tmp && /opt/linuxdeployqt-continuous-x86_64.AppImage BitBox -appimage -unsupported-allow-new-glibc
 	mv build/linux-tmp/BitBoxApp-*-x86_64.AppImage build/linux/
 osx:
+	export PATH := $(PATH)
 	$(MAKE) clean
 	cd server && $(MAKE) macosx
 	$(MAKE) base
+	echo ${PATH}
+	ls ~/Qt/6.2.4/macos/bin/qmake
+	~/Qt/6.2.4/macos/bin/qmake -version
+	qmake -version
 	qmake -set MACOS_MIN_VERSION $(MACOS_MIN_VERSION)
 	# See https://stackoverflow.com/questions/77136519/qmake-failing-with-sdk-14-ventura-13-5-2
 	qmake -early QMAKE_DEFAULT_LIBDIRS=$(shell xcrun -show-sdk-path)/usr/lib -o build/Makefile
@@ -54,9 +61,7 @@ osx:
 	mv build/BitBox.app build/osx/
 	cp resources/MacOS/Info.plist build/osx/BitBox.app/Contents/
 	cp resources/MacOS/icon.icns build/osx/BitBox.app/Contents/Resources/
-	# The `-executable` flag is needed to make the macOS build work when Qt is installed from homebrew.
-	# It works without it when Qt is installed using the official installer.
-	cd build/osx/ && macdeployqt BitBox.app -executable=BitBox.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/Current/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess
+	cd build/osx/ && macdeployqt BitBox.app
 	cp server/libserver.so build/osx/BitBox.app/Contents/Frameworks
 	cp build/assets.rcc build/osx/BitBox.app/Contents/MacOS/
 	install_name_tool -change libserver.so @executable_path/../Frameworks/libserver.so build/osx/BitBox.app/Contents/MacOS/BitBox

diff --git a/scripts/github-ci.sh b/scripts/github-ci.sh
@@ -32,11 +32,11 @@ if [ "$OS_NAME" == "osx" ]; then
     # GitHub CI installs Go directly in the macos action, before executing
     # this script.
     go version
-    export PATH="~/Qt/6.2.4/macos/bin:~/Qt/6.2.4/macos/libexec:$PATH"
+    export PATH="$PATH:~/Qt/6.2.4/macos/bin:~/Qt/6.2.4/macos/libexec"
     export LDFLAGS="-L~/Qt/6.2.4/macos/lib"
     export CPPFLAGS="-I~/Qt/6.2.4/macos/include"
     export GOPATH=~/go
-    export PATH=$PATH:~/go/bin
+    export PATH="$PATH:~/go/bin"
     mkdir -p $GOPATH/$(dirname $GO_SRC_DIR)
     # GitHub checkout action (git clone) seem to require current work dir
     # to be the root of the repo during its clean up phase. So, we push it