AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bug QT_BIN_DIR

Browse source
This commit is contained in:
Macbook 2024-10-09 22:13:52 +07:00
parent 31938899a2
commit 7d186c3c84
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
deploy/build_macos_ne.sh
View file

@ -37,25 +37,33 @@ DMG_FILENAME=$PROJECT_DIR/${APP_NAME}.dmg
# Search Qt # Search Qt
if [ -z "${QT_VERSION+x}" ]; then if [ -z "${QT_VERSION+x}" ]; then
QT_VERSION=6.8.0; echo "QT_VERSION is not set, using default 6.8.0"
QIF_VERSION=4.7 QT_VERSION=6.8.0
QIF_VERSION=4.7
fi
QT_BIN_DIR=$HOME/Qt/$QT_VERSION/macos/bin QT_BIN_DIR=$HOME/Qt/$QT_VERSION/macos/bin
QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin
# Check if QT_BIN_DIR is properly set
if [ -z "${QT_BIN_DIR+x}" ]; then
echo "Error: QT_BIN_DIR is not set."
exit 1
fi fi
echo "Using Qt in $QT_BIN_DIR" echo "Using Qt in $QT_BIN_DIR"
echo "Using QIF in $QIF_BIN_DIR" echo "Using QIF in $QIF_BIN_DIR"
# Setup environment paths # Setup environment paths
export QT_BIN_DIR=$HOME/Qt/$QT_VERSION/macos/bin export QT_BIN_DIR
export QT_MACOS_ROOT_DIR=$HOME/Qt/$QT_VERSION/macos export QT_MACOS_ROOT_DIR=$HOME/Qt/$QT_VERSION/macos
export QT_MACOS_BIN=$QT_BIN_DIR export QT_MACOS_BIN=$QT_BIN_DIR
export PATH=$PATH:~/go/bin export PATH=$PATH:~/go/bin
# Checking env # Checking env
$QT_BIN_DIR/qt-cmake --version $QT_BIN_DIR/qt-cmake --version || { echo "Error: qt-cmake not found in $QT_BIN_DIR"; exit 1; }
cmake --version cmake --version || { echo "Error: cmake not found"; exit 1; }
clang -v clang -v || { echo "Error: clang not found"; exit 1; }
# Build App # Build App
echo "Building App..." echo "Building App..."
@ -151,7 +159,6 @@ if [ "${MAC_CERT_PW+x}" ]; then
fi fi
echo "Building DMG installer..." echo "Building DMG installer..."
# Allow Terminal to make changes in Privacy & Security > App Management
hdiutil create -size 256mb -volname AmneziaVPN -srcfolder $BUILD_DIR/installer/$APP_NAME.app -ov -format UDZO $DMG_FILENAME hdiutil create -size 256mb -volname AmneziaVPN -srcfolder $BUILD_DIR/installer/$APP_NAME.app -ov -format UDZO $DMG_FILENAME
if [ "${MAC_CERT_PW+x}" ]; then if [ "${MAC_CERT_PW+x}" ]; then