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

Adopted GitHub Actions build config for Qt6

Browse source
This commit is contained in:
Dmitriy Karpushin 2023-01-09 13:46:45 +03:00
parent 3e2835bef6
commit d1990a4263
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
set(PROJECT AmneziaVPN) set(PROJECT AmneziaVPN)
project(${PROJECT}) project(${PROJECT})
if(ANDROID) #if(ANDROID)
set(QT_ANDROID_BUILD_ALL_ABIS ON) # set(QT_ANDROID_BUILD_ALL_ABIS ON)
endif() #endif()
add_subdirectory(client) add_subdirectory(client)

24
deploy/build_android.sh
View file

@ -46,8 +46,12 @@ cd $BUILD_DIR
echo "HOST Qt: $QT_HOST_PATH" echo "HOST Qt: $QT_HOST_PATH"
$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -DQT_HOST_PATH=$QT_HOST_PATH -DCMAKE_BUILD_TYPE=Release $QT_BIN_DIR/qt-cmake -S $PROJECT_DIR \
cmake --build . --config Release -DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL="ON" \
-DQT_HOST_PATH=$QT_HOST_PATH \
-DCMAKE_BUILD_TYPE="Release"
cmake --build . --config release
# $QT_BIN_DIR/qmake -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro # $QT_BIN_DIR/qmake -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro
# echo "Executing make... may take long time" # echo "Executing make... may take long time"
@ -56,15 +60,15 @@ cmake --build . --config Release
# $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make install INSTALL_ROOT=android # $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make install INSTALL_ROOT=android
# echo "Build OK" # echo "Build OK"
# echo "............Deploy.................." echo "............Deploy.................."
# cd $OUT_APP_DIR cd $OUT_APP_DIR
# $QT_BIN_DIR/androiddeployqt \ $QT_HOST_PATH/bin/androiddeployqt \
# --output $OUT_APP_DIR/android \ --output $OUT_APP_DIR/android-build \
# --gradle \ --gradle \
# --release \ --release \
# --input android-AmneziaVPN-deployment-settings.json --input android-AmneziaVPN-deployment-settings.json
echo "............Copy apk.................." echo "............Copy apk.................."
cp $OUT_APP_DIR/android/build/outputs/apk/release/android-release-unsigned.apk \ cp $OUT_APP_DIR/android-build/build/outputs/apk/release/android-build-release-unsigned.apk \
$PROJECT_DIR/AmneziaVPN-release-unsigned.apk $PROJECT_DIR/AmneziaVPN-release-unsigned.apk