mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
* added changelog drawer * Created a scaffold for Linux installation * implement Linux updating * Add debug logs about installer in service * Add client side of installation logic for Windows and MacOS * Add service side of installation logic for Windows * ru readme * Update README_RU.md * Add files via upload * chore: added clang-format config files (#1293) * Update README_RU.md * Update README.md * feature: added subscription expiration date for premium v2 (#1261) * feature: added subscription expiration date for premium v2 * feature: added a check for the presence of the “services” field in the response body of the getServicesList() function * feature: added prohibition to change location when connection is active * bugfix: renamed public_key->end_date to public_key->expires_at according to the changes on the backend * feature/xray user management (#972) * feature: implement client management functionality for Xray --------- Co-authored-by: aiamnezia <ai@amnezia.org> Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com> * Fix formatting * Add some logs * Add logs from installattion shell on Windows * Fix installation for Windows and MacOS * Optimized code * Move installer running to client side for Ubuntu * Move installer launch logic to client side for Windows * Clean service code * Add linux_install script to resources * Add logs for UpdateController * Add draft for MacOS installation * Disable updates checking for Android and iOS * chore: fixed macos update script * chore: remove duplicate lines * chore: post merge fixes * chore: add missing ifdef * decrease version for testing * chore: added changelog text processing depend on OS * add .vscode to .gitignore * Change updater downloading method to retrieving link from the gateway * add Release date file creation to s3 deploy script * Add release date downloading from endpoint * update check refactoring * feat: switch macOS auto-update from DMG to ZIP+PKG installer - Update macOS artifact URL from .dmg to .zip - Rewrite mac_installer.sh to extract ZIP and install PKG via osascript - Increase download timeout to 30s for larger ZIP files * fix: fix Android build * feat: Change get request for updater link to post * refactor: preparing NewsModel for update notifications - Changed `updateModel` to `setNewsList` for better semantic meaning. - Delegate model container updating to private method updateModel - Updated the logic for marking news as read to use item IDs instead of a boolean flag. * feat: Move update notification in news list - Updated `UpdateController` to handle empty release dates in header text. - Added `getVersion` method to `UpdateController` for version retrieval. - Enhanced `NewsModel` to support update notifications with new methods for marking updates as skipped and setting update notifications. - Updated QML pages to display update information and provide actions for updates and skipping them. - Introduced `isUpdate` property in `NewsItem` to differentiate between regular news and updates. * feat: Implement rate limit workaround for gateway requests - Added a delay before contacting the gateway in both `UpdateController` and `ApiNewsController` to prevent rate limit issues caused by simultaneous requests. * refactor: Convert synchronous network requests to asynchronous in UpdateController - Updated `UpdateController` to use asynchronous network requests for fetching gateway URL, version info, changelog, and release date. - Introduced `doGetAsync` method to handle asynchronous GET requests with error handling. - Removed synchronous methods to improve responsiveness and prevent blocking the UI during network operations. - Added a mechanism to prevent multiple concurrent update checks. * chore: Decrease AmneziaVPN version to 4.8.10.0 in CMakeLists.txt for testing * refactor: Improve update check handling to avoid rate limit issues - Updated `CoreController` to initiate update checks after news fetching is complete. - Removed synchronous waiting in `ApiNewsController` to streamline the fetching process. * fix: fixed typo in IsReadRole * fix: fix updater filenames * chore: move updateController to core * refactor: update to mvvm * chore: tiny fix --------- Co-authored-by: aiamnezia <ai@amnezia.org> Co-authored-by: aiamnezia <ai@amnezia.com> Co-authored-by: Pokamest Nikak <pokamest@gmail.com> Co-authored-by: KsZnak <ksu@amnezia.org> Co-authored-by: Cyril Anisimov <cyan84@gmail.com> Co-authored-by: vkamn <vk@amnezia.org>
254 lines
8.0 KiB
CMake
254 lines
8.0 KiB
CMake
cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
|
|
|
|
set(PROJECT AmneziaVPN)
|
|
project(${PROJECT})
|
|
|
|
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
|
set_property(GLOBAL PROPERTY AUTOGEN_TARGETS_FOLDER "Autogen")
|
|
set_property(GLOBAL PROPERTY AUTOMOC_TARGETS_FOLDER "Autogen")
|
|
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Autogen")
|
|
|
|
set(PACKAGES
|
|
Core Gui Network Xml
|
|
RemoteObjects Quick Svg QuickControls2
|
|
Core5Compat Concurrent LinguistTools
|
|
)
|
|
|
|
execute_process(
|
|
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
|
|
COMMAND git rev-parse --short HEAD
|
|
OUTPUT_VARIABLE GIT_COMMIT_HASH
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
)
|
|
|
|
add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
|
|
|
|
add_definitions(-DPROD_AGW_PUBLIC_KEY="$ENV{PROD_AGW_PUBLIC_KEY}")
|
|
add_definitions(-DPROD_S3_ENDPOINT="$ENV{PROD_S3_ENDPOINT}")
|
|
add_definitions(-DFALLBACK_S3_ENDPOINT="$ENV{FALLBACK_S3_ENDPOINT}")
|
|
|
|
add_definitions(-DDEV_AGW_PUBLIC_KEY="$ENV{DEV_AGW_PUBLIC_KEY}")
|
|
add_definitions(-DDEV_AGW_ENDPOINT="$ENV{DEV_AGW_ENDPOINT}")
|
|
add_definitions(-DDEV_S3_ENDPOINT="$ENV{DEV_S3_ENDPOINT}")
|
|
|
|
add_definitions(-DFREE_V2_ENDPOINT="$ENV{FREE_V2_ENDPOINT}")
|
|
add_definitions(-DPREM_V1_ENDPOINT="$ENV{PREM_V1_ENDPOINT}")
|
|
|
|
if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
|
|
set(PACKAGES ${PACKAGES} Widgets)
|
|
endif()
|
|
|
|
find_package(Qt6 REQUIRED COMPONENTS ${PACKAGES})
|
|
|
|
set(LIBS ${LIBS}
|
|
Qt6::Core Qt6::Gui
|
|
Qt6::Network Qt6::Xml Qt6::RemoteObjects
|
|
Qt6::Quick Qt6::Svg Qt6::QuickControls2
|
|
Qt6::Core5Compat Qt6::Concurrent
|
|
)
|
|
|
|
if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
|
|
set(LIBS ${LIBS} Qt6::Widgets)
|
|
endif()
|
|
|
|
qt_standard_project_setup()
|
|
qt_add_executable(${PROJECT} MANUAL_FINALIZATION)
|
|
target_include_directories(${PROJECT} PUBLIC
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
|
|
)
|
|
|
|
if(WIN32 OR (APPLE AND NOT IOS AND NOT MACOS_NE) OR (LINUX AND NOT ANDROID))
|
|
qt_add_repc_replicas(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc_interface.rep)
|
|
qt_add_repc_replicas(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc_process_interface.rep)
|
|
endif()
|
|
|
|
qt6_add_resources(QRC ${QRC}
|
|
${CMAKE_CURRENT_LIST_DIR}/images/images.qrc
|
|
${CMAKE_CURRENT_LIST_DIR}/images/flagKit.qrc
|
|
${CMAKE_CURRENT_LIST_DIR}/client_scripts/clientScripts.qrc
|
|
${CMAKE_CURRENT_LIST_DIR}/ui/qml/qml.qrc
|
|
${CMAKE_CURRENT_LIST_DIR}/server_scripts/serverScripts.qrc
|
|
)
|
|
|
|
# -- i18n begin
|
|
set(CMAKE_AUTORCC ON)
|
|
|
|
set(AMNEZIAVPN_TS_FILES
|
|
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru_RU.ts
|
|
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_zh_CN.ts
|
|
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_fa_IR.ts
|
|
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ar_EG.ts
|
|
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_my_MM.ts
|
|
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_uk_UA.ts
|
|
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ur_PK.ts
|
|
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_hi_IN.ts
|
|
)
|
|
|
|
file(GLOB_RECURSE AMNEZIAVPN_TS_SOURCES *.qrc *.cpp *.h *.ui)
|
|
list(FILTER AMNEZIAVPN_TS_SOURCES EXCLUDE REGEX "qtgamepad/examples")
|
|
|
|
qt_create_translation(AMNEZIAVPN_QM_FILES ${AMNEZIAVPN_TS_SOURCES} ${AMNEZIAVPN_TS_FILES})
|
|
|
|
set(QM_FILE_LIST "")
|
|
foreach(FILE ${AMNEZIAVPN_QM_FILES})
|
|
get_filename_component(QM_FILE_NAME ${FILE} NAME)
|
|
list(APPEND QM_FILE_LIST "<file>${QM_FILE_NAME}</file>")
|
|
endforeach()
|
|
string(REPLACE ";" "" QM_FILE_LIST ${QM_FILE_LIST})
|
|
|
|
configure_file(${CMAKE_CURRENT_LIST_DIR}/translations/translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
|
|
qt6_add_resources(QRC ${I18NQRC} ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
|
|
# -- i18n end
|
|
|
|
set(IS_CI ${CI})
|
|
if(IS_CI)
|
|
message("Detected CI env")
|
|
find_program(CCACHE "ccache")
|
|
if(CCACHE)
|
|
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE}")
|
|
endif()
|
|
endif()
|
|
|
|
include(${CMAKE_CURRENT_LIST_DIR}/cmake/3rdparty.cmake)
|
|
include(${CMAKE_CURRENT_LIST_DIR}/cmake/sources.cmake)
|
|
|
|
include_directories(
|
|
${CMAKE_CURRENT_LIST_DIR}/../ipc
|
|
${CMAKE_CURRENT_LIST_DIR}/../common/logger
|
|
${CMAKE_CURRENT_LIST_DIR}
|
|
${CMAKE_CURRENT_BINARY_DIR}
|
|
)
|
|
|
|
if(MACOS_NE)
|
|
message("MACOS_NE is ON")
|
|
add_definitions(-DQ_OS_MAC)
|
|
add_definitions(-DMACOS_NE)
|
|
message("Add macros for MacOS Network Extension")
|
|
else()
|
|
message("MACOS_NE is OFF")
|
|
endif()
|
|
|
|
include_directories(mozilla)
|
|
include_directories(mozilla/shared)
|
|
include_directories(mozilla/models)
|
|
|
|
configure_file(${CMAKE_CURRENT_LIST_DIR}/../version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
|
|
|
|
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
|
target_compile_definitions(${PROJECT} PRIVATE "MZ_DEBUG")
|
|
endif()
|
|
|
|
if(WIN32)
|
|
configure_file(
|
|
${CMAKE_CURRENT_LIST_DIR}/platforms/windows/amneziavpn.rc.in
|
|
${CMAKE_CURRENT_BINARY_DIR}/amneziavpn.rc
|
|
)
|
|
|
|
set(LIBS ${LIBS}
|
|
user32
|
|
rasapi32
|
|
shlwapi
|
|
iphlpapi
|
|
ws2_32
|
|
gdi32
|
|
)
|
|
|
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
|
|
endif()
|
|
|
|
if(APPLE)
|
|
cmake_policy(SET CMP0099 NEW)
|
|
cmake_policy(SET CMP0114 NEW)
|
|
|
|
if(NOT BUILD_OSX_APP_IDENTIFIER)
|
|
set(BUILD_OSX_APP_IDENTIFIER org.amnezia.AmneziaVPN CACHE STRING "OSX Application identifier")
|
|
endif()
|
|
if(NOT BUILD_IOS_APP_IDENTIFIER)
|
|
set(BUILD_IOS_APP_IDENTIFIER org.amnezia.AmneziaVPN CACHE STRING "iOS Application identifier")
|
|
endif()
|
|
if(NOT BUILD_IOS_GROUP_IDENTIFIER)
|
|
set(BUILD_IOS_GROUP_IDENTIFIER group.org.amnezia.AmneziaVPN CACHE STRING "iOS Group identifier")
|
|
endif()
|
|
if(NOT BUILD_VPN_DEVELOPMENT_TEAM)
|
|
set(BUILD_VPN_DEVELOPMENT_TEAM X7UJ388FXK CACHE STRING "Amnezia VPN Development Team")
|
|
endif()
|
|
|
|
set(CMAKE_XCODE_GENERATE_SCHEME FALSE)
|
|
set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${BUILD_VPN_DEVELOPMENT_TEAM})
|
|
set(CMAKE_XCODE_ATTRIBUTE_GROUP_ID_IOS ${BUILD_IOS_GROUP_IDENTIFIER})
|
|
endif()
|
|
|
|
if(LINUX AND NOT ANDROID)
|
|
set(LIBS ${LIBS} -static-libstdc++ -static-libgcc -ldl)
|
|
link_directories(${CMAKE_CURRENT_LIST_DIR}/platforms/linux)
|
|
endif()
|
|
|
|
if(WIN32 OR (APPLE AND NOT IOS AND NOT MACOS_NE) OR (LINUX AND NOT ANDROID))
|
|
add_compile_definitions(AMNEZIA_DESKTOP)
|
|
endif()
|
|
|
|
if(ANDROID)
|
|
include(cmake/android.cmake)
|
|
endif()
|
|
|
|
if(IOS)
|
|
include(cmake/ios.cmake)
|
|
include(cmake/ios-arch-fixup.cmake)
|
|
elseif(APPLE AND MACOS_NE)
|
|
include(cmake/macos_ne.cmake)
|
|
elseif(APPLE)
|
|
include(cmake/osxtools.cmake)
|
|
include(cmake/macos.cmake)
|
|
endif()
|
|
|
|
target_link_libraries(${PROJECT} PRIVATE ${LIBS})
|
|
target_compile_definitions(${PROJECT} PRIVATE "MZ_$<UPPER_CASE:${MZ_PLATFORM_NAME}>")
|
|
|
|
# deploy artifacts required to run the application to the debug build folder
|
|
if(WIN32)
|
|
if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
|
|
set(DEPLOY_PLATFORM_PATH "windows/x64")
|
|
else()
|
|
set(DEPLOY_PLATFORM_PATH "windows/x32")
|
|
endif()
|
|
elseif(LINUX)
|
|
set(DEPLOY_PLATFORM_PATH "linux/client")
|
|
elseif(APPLE AND NOT IOS)
|
|
set(DEPLOY_PLATFORM_PATH "macos")
|
|
endif()
|
|
|
|
if(NOT IOS AND NOT ANDROID AND NOT MACOS_NE)
|
|
add_custom_command(
|
|
TARGET ${PROJECT} POST_BUILD
|
|
COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_directory,true>
|
|
${CMAKE_SOURCE_DIR}/deploy/data/${DEPLOY_PLATFORM_PATH}
|
|
$<TARGET_FILE_DIR:${PROJECT}>
|
|
COMMAND_EXPAND_LISTS
|
|
)
|
|
add_custom_command(
|
|
TARGET ${PROJECT} POST_BUILD
|
|
COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_directory,true>
|
|
${CMAKE_SOURCE_DIR}/client/3rd-prebuilt/deploy-prebuilt/${DEPLOY_PLATFORM_PATH}
|
|
$<TARGET_FILE_DIR:${PROJECT}>
|
|
COMMAND_EXPAND_LISTS
|
|
)
|
|
endif()
|
|
|
|
if(NOT IOS AND NOT ANDROID AND NOT MACOS_NE)
|
|
add_subdirectory(tests)
|
|
endif()
|
|
|
|
list(APPEND SOURCES ${CMAKE_CURRENT_LIST_DIR}/main.cpp)
|
|
|
|
target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC} ${I18NQRC})
|
|
|
|
# Finalize the executable so Qt can gather/deploy QML modules and plugins correctly (Android needs this).
|
|
if(COMMAND qt_import_qml_plugins)
|
|
qt_import_qml_plugins(${PROJECT})
|
|
endif()
|
|
if(COMMAND qt_finalize_executable)
|
|
qt_finalize_executable(${PROJECT})
|
|
else()
|
|
qt_finalize_target(${PROJECT})
|
|
endif()
|