mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-10-23 03:26:59 +09:00
* feat: move amnezia hardcode from sources to cmake * feat: move amnezia hardcode from sources to cmake * refactor: remove prem v1 migration * chore: move more branding * fix: use host-matching architecture for iOS simulator builds x86_64 was hardcoded; Apple Silicon Macs run arm64 simulators and Xcode 26 has no Rosetta simulator destinations, so simulators showed as unsupported. * fix: mark the branded media assets catalog as a bundle resource MACOSX_PACKAGE_LOCATION was set on the upstream Media.xcassets path while target_sources uses CLIENT_IOS_MEDIA_ASSETS_PATH, so a branded catalog was never compiled by actool and the app got a blank icon. * fix: parametrize the Swift app-group identifier used by Log.swift Log.swift hardcoded Amnezia's own app-group instead of the branded one, since Swift -D flags can't carry the string value like the ObjC++ side does. Generate a small Swift constants file instead, same pattern as version.h.in, wired into all four targets that compile Log.swift. * fix: use APPLICATION_NAME instead of hardcoded Amnezia in log line format Every log line printed "Amnezia" regardless of branding; the log file name two lines above this already used APPLICATION_NAME correctly. * fix: restore branding fixes dropped by rebase, rename swiftInterop to swiftBridge * fix: move more branding variables to cmake * feat: move macOS branding from sources to cmake - macos/app/Info.plist.in: app group, camera usage text, UTI ids and descriptions now come from CLIENT_APPLICATION_NAME / BUILD_* variables, mirroring ios/app/Info.plist.in - macos/networkextension/Info.plist.in: bundle names and app group ids are templated; the plist is configured by CMake into the binary dir because Xcode only expands its own $(...) settings - new knobs: CLIENT_MACOS_MEDIA_ASSETS_PATH, CLIENT_MACOS_APP_ICNS_PATH, CLIENT_MACOS_PROVISIONING_PROFILE_SPECIFIER(_DEBUG), CLIENT_MACOS_NE_PROVISIONING_PROFILE_SPECIFIER(_DEBUG) * fix: resolve macOS pf template paths relative to the client source dir CMAKE_SOURCE_DIR points at the wrapper project when the client is built as a subproject, so the pf template lookup failed there. * chore: separate brandings defaults --------- Co-authored-by: vkamn <vk@amnezia.org>
153 lines
6.0 KiB
CMake
153 lines
6.0 KiB
CMake
message("Client ==> MacOS NE build")
|
|
|
|
set_target_properties(${PROJECT} PROPERTIES MACOSX_BUNDLE TRUE)
|
|
|
|
set(APPLE_PROJECT_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
|
|
|
|
enable_language(OBJC)
|
|
enable_language(OBJCXX)
|
|
enable_language(Swift)
|
|
|
|
find_package(Qt6 REQUIRED COMPONENTS ShaderTools Widgets)
|
|
# Link Qt Widgets for QWidget, QMenu, QAction etc.
|
|
set(LIBS ${LIBS} Qt6::ShaderTools Qt6::Widgets)
|
|
|
|
find_library(FW_AUTHENTICATIONSERVICES AuthenticationServices)
|
|
find_library(FW_AVFOUNDATION AVFoundation)
|
|
find_library(FW_FOUNDATION Foundation)
|
|
find_library(FW_STOREKIT StoreKit)
|
|
find_library(FW_SERVICEMGMT ServiceManagement)
|
|
find_library(FW_USERNOTIFICATIONS UserNotifications)
|
|
find_library(FW_NETWORKEXTENSION NetworkExtension)
|
|
|
|
set(LIBS ${LIBS}
|
|
${FW_AUTHENTICATIONSERVICES}
|
|
${FW_AVFOUNDATION}
|
|
${FW_FOUNDATION}
|
|
${FW_STOREKIT}
|
|
${FW_SERVICEMGMT}
|
|
${FW_USERNOTIFICATIONS}
|
|
${FW_NETWORKEXTENSION}
|
|
)
|
|
|
|
|
|
set(HEADERS ${HEADERS}
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller_wrapper.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/StoreKitController.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QtAppDelegate.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QtAppDelegate-C-Interface.h
|
|
)
|
|
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller.h PROPERTIES OBJECTIVE_CPP_HEADER TRUE)
|
|
|
|
|
|
set(SOURCES ${SOURCES}
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller.mm
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller_wrapper.mm
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/StoreKitController.mm
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosglue.mm
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QRCodeReaderBase.mm
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QtAppDelegate.mm
|
|
)
|
|
|
|
target_include_directories(${PROJECT} PRIVATE
|
|
${Qt6Gui_PRIVATE_INCLUDE_DIRS}
|
|
${Qt6Widgets_PRIVATE_INCLUDE_DIRS}
|
|
)
|
|
|
|
|
|
set_target_properties(${PROJECT} PROPERTIES
|
|
XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION
|
|
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macos/app/Info.plist.in
|
|
MACOSX_BUNDLE_ICON_FILE "AppIcon"
|
|
MACOSX_BUNDLE_INFO_STRING "${CLIENT_APPLICATION_NAME}"
|
|
MACOSX_BUNDLE_BUNDLE_NAME "${CLIENT_APPLICATION_NAME}"
|
|
MACOSX_BUNDLE_GUI_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}"
|
|
MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}"
|
|
MACOSX_BUNDLE_LONG_VERSION_STRING "${APPLE_PROJECT_VERSION}-${CMAKE_PROJECT_VERSION_TWEAK}"
|
|
MACOSX_BUNDLE_SHORT_VERSION_STRING "${APPLE_PROJECT_VERSION}"
|
|
XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}"
|
|
XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CLIENT_MACOS_APP_ENTITLEMENTS_PATH}"
|
|
XCODE_ATTRIBUTE_MARKETING_VERSION "${APPLE_PROJECT_VERSION}"
|
|
XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}"
|
|
XCODE_ATTRIBUTE_PRODUCT_NAME "${CLIENT_APPLICATION_NAME}"
|
|
XCODE_ATTRIBUTE_BUNDLE_INFO_STRING "${CLIENT_APPLICATION_NAME}"
|
|
XCODE_GENERATE_SCHEME TRUE
|
|
XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon"
|
|
XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY "NO"
|
|
XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY "YES"
|
|
|
|
XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../Frameworks"
|
|
XCODE_EMBED_APP_EXTENSIONS ${CLIENT_MACOS_NE_TARGET_NAME}
|
|
)
|
|
|
|
if(DEPLOY)
|
|
set_target_properties(${PROJECT} PROPERTIES
|
|
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution"
|
|
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development"
|
|
XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual
|
|
XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "${CLIENT_MACOS_PROVISIONING_PROFILE_SPECIFIER}"
|
|
XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "${CLIENT_MACOS_PROVISIONING_PROFILE_SPECIFIER_DEBUG}"
|
|
)
|
|
else()
|
|
set_target_properties(${PROJECT} PROPERTIES
|
|
XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic
|
|
)
|
|
endif()
|
|
|
|
set_target_properties(${PROJECT} PROPERTIES
|
|
XCODE_ATTRIBUTE_SWIFT_VERSION "5.0"
|
|
XCODE_ATTRIBUTE_CLANG_ENABLE_MODULES "YES"
|
|
XCODE_ATTRIBUTE_SWIFT_PRECOMPILE_BRIDGING_HEADER "NO"
|
|
XCODE_ATTRIBUTE_SWIFT_OBJC_INTERFACE_HEADER_NAME "${CLIENT_SWIFT_OBJC_HEADER_NAME}"
|
|
XCODE_ATTRIBUTE_SWIFT_OBJC_INTEROP_MODE "objcxx"
|
|
)
|
|
set_target_properties(${PROJECT} PROPERTIES
|
|
XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${BUILD_VPN_DEVELOPMENT_TEAM}"
|
|
)
|
|
target_include_directories(${PROJECT} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
|
|
target_compile_options(${PROJECT} PRIVATE
|
|
-DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\"
|
|
-DVPN_NE_BUNDLEID=\"${BUILD_IOS_APP_IDENTIFIER}.network-extension\"
|
|
)
|
|
|
|
set(WG_APPLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd/amneziawg-apple/Sources)
|
|
|
|
target_sources(${PROJECT} PRIVATE
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKitC/x25519.c
|
|
${CLIENT_ROOT_DIR}/platforms/ios/LogController.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/Log.swift
|
|
${CLIENT_GROUP_IDENTIFIER_SWIFT_FILE}
|
|
${CLIENT_ROOT_DIR}/platforms/ios/LogRecord.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/ScreenProtection.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/VPNCController.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/StoreKit2Helper.swift
|
|
)
|
|
|
|
set_source_files_properties(
|
|
${CLIENT_MACOS_MEDIA_ASSETS_PATH}
|
|
PROPERTIES MACOSX_PACKAGE_LOCATION Resources
|
|
)
|
|
|
|
target_sources(${PROJECT} PRIVATE
|
|
${CLIENT_MACOS_MEDIA_ASSETS_PATH}
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ios/app/PrivacyInfo.xcprivacy
|
|
)
|
|
|
|
set_property(TARGET ${PROJECT} APPEND PROPERTY RESOURCE
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ios/app/PrivacyInfo.xcprivacy
|
|
)
|
|
|
|
add_subdirectory(macos/networkextension)
|
|
add_dependencies(${PROJECT} ${CLIENT_MACOS_NE_TARGET_NAME})
|
|
|
|
get_target_property(QtCore_location Qt6::Core LOCATION)
|
|
message("QtCore_location")
|
|
message(${QtCore_location})
|
|
|
|
get_filename_component(QT_BIN_DIR_DETECTED "${QtCore_location}/../../../../../bin" ABSOLUTE)
|
|
|
|
add_custom_command(TARGET ${PROJECT} POST_BUILD
|
|
COMMAND ${QT_BIN_DIR_DETECTED}/macdeployqt $<TARGET_BUNDLE_DIR:${PROJECT}> -appstore-compliant -qmldir=${CMAKE_CURRENT_SOURCE_DIR} -no-codesign
|
|
)
|