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

MacOS deploy fix

Browse source
This commit is contained in:
pokamest 2023-01-08 17:21:51 -08:00
parent 8da30b216f
commit 85020270d5
3 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/deploy.yml vendored
View file

@ -166,14 +166,6 @@ jobs:
team-id: 'X7UJ388FXK' team-id: 'X7UJ388FXK'
configuration: Release configuration: Release
# ------------------------------------------------------ # ------------------------------------------------------
Build-MacOS: Build-MacOS:

8
client/CMakeLists.txt
View file

@ -292,8 +292,6 @@ endif()
if(IOS) if(IOS)
message("Client iOS build") message("Client iOS build")
find_package(Qt6 REQUIRED COMPONENTS ShaderTools) find_package(Qt6 REQUIRED COMPONENTS ShaderTools)
set(LIBS ${LIBS} Qt6::ShaderTools) set(LIBS ${LIBS} Qt6::ShaderTools)
@ -346,7 +344,11 @@ qt_add_executable(${PROJECT} ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})
qt_add_translations(${PROJECT} TS_FILES qt_add_translations(${PROJECT} TS_FILES
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts) ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts)
# NETWORKEXTENSION=1 if(APPLE AND NOT IOS)
set_target_properties(AmneziaVPN PROPERTIES
MACOSX_BUNDLE TRUE
)
endif()
if(IOS) if(IOS)
enable_language(OBJC) enable_language(OBJC)

10
deploy/build_macos.sh
View file

@ -38,9 +38,9 @@ DMG_FILENAME=$PROJECT_DIR/${APP_NAME}.dmg
# Seacrh Qt # Seacrh Qt
if [ -z "${QT_VERSION+x}" ]; then if [ -z "${QT_VERSION+x}" ]; then
QT_VERSION=5.15.2; QT_VERSION=6.4.1;
QIF_VERSION=4.1 QIF_VERSION=4.1
QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/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
fi fi
@ -58,9 +58,7 @@ echo "Building App..."
cd $BUILD_DIR cd $BUILD_DIR
$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -B $BUILD_DIR $QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -B $BUILD_DIR
cmake --build . --config release cmake --build . --config release --target all
# $QT_BIN_DIR/qmake $PROJECT_DIR/AmneziaVPN.pro 'CONFIG+=release CONFIG+=x86_64'
# make -j `sysctl -n hw.ncpu`
# Build and run tests here # Build and run tests here
@ -74,7 +72,7 @@ echo "Packaging ..."
#cd $DEPLOY_DIR #cd $DEPLOY_DIR
$QT_BIN_DIR/macdeployqt $OUT_APP_DIR/$APP_FILENAME -always-overwrite -qmldir=$PROJECT_DIR $QT_BIN_DIR/macdeployqt $OUT_APP_DIR/$APP_FILENAME -always-overwrite -qmldir=$PROJECT_DIR
cp -av $BUILD_DIR/service/server/$APP_NAME-service.app/Contents/macOS/$APP_NAME-service $BUNDLE_DIR/Contents/macOS cp -av $BUILD_DIR/service/server/$APP_NAME-service $BUNDLE_DIR/Contents/macOS
cp -Rv $PROJECT_DIR/deploy/data/macos/* $BUNDLE_DIR/Contents/macOS cp -Rv $PROJECT_DIR/deploy/data/macos/* $BUNDLE_DIR/Contents/macOS
rm -f $BUNDLE_DIR/Contents/macOS/post_install.sh $BUNDLE_DIR/Contents/macOS/post_uninstall.sh rm -f $BUNDLE_DIR/Contents/macOS/post_install.sh $BUNDLE_DIR/Contents/macOS/post_uninstall.sh