diff --git a/client/cmake/macos.cmake b/client/cmake/macos.cmake index 7b7cd3812..2320a7c46 100644 --- a/client/cmake/macos.cmake +++ b/client/cmake/macos.cmake @@ -18,7 +18,15 @@ set(LIBS ${LIBS} ${FW_NETWORK_EXTENSION} ) -set_target_properties(${PROJECT} PROPERTIES MACOSX_BUNDLE TRUE) +set_target_properties(${PROJECT} PROPERTIES + MACOSX_BUNDLE TRUE + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macos/app/Info.plist + XCODE_ATTRIBUTE_MARKETING_VERSION "${APP_MAJOR_VERSION}" + XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION "${BUILD_ID}" + XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER ${BUILD_OSX_APP_IDENTIFIER} + XCODE_ATTRIBUTE_PRODUCT_NAME "AmneziaVPN" + XCODE_ATTRIBUTE_EXECUTABLE_NAME "AmneziaVPN" +) set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE INTERNAL "" FORCE) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15) diff --git a/service/server/CMakeLists.txt b/service/server/CMakeLists.txt index 7916a5765..9da5a1083 100644 --- a/service/server/CMakeLists.txt +++ b/service/server/CMakeLists.txt @@ -162,7 +162,14 @@ if (WIN32 OR APPLE OR LINUX) ) endif() +set(RESOURCES) + if(WIN32) + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/amneziavpn-service.rc.in + ${CMAKE_CURRENT_BINARY_DIR}/amneziavpn-service.rc + ) + set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/tapcontroller_win.h ${CMAKE_CURRENT_LIST_DIR}/router_win.h @@ -203,6 +210,10 @@ if(WIN32) ${CMAKE_CURRENT_SOURCE_DIR}/../../client/platforms/windows/windowsutils.cpp ) + set(RESOURCES ${RESOURCES} + ${CMAKE_CURRENT_BINARY_DIR}/amneziavpn-service.rc + ) + set(LIBS user32 rasapi32 @@ -308,7 +319,7 @@ include_directories( ) -add_executable(${PROJECT} ${SOURCES} ${HEADERS}) +add_executable(${PROJECT} ${SOURCES} ${HEADERS} ${RESOURCES}) target_link_libraries(${PROJECT} PRIVATE Qt6::Core Qt6::Widgets Qt6::Network Qt6::RemoteObjects Qt6::Core5Compat Qt6::DBus ${LIBS}) target_compile_definitions(${PROJECT} PRIVATE "MZ_$") diff --git a/service/server/amneziavpn-service.rc.in b/service/server/amneziavpn-service.rc.in new file mode 100644 index 000000000..8ba60d38b --- /dev/null +++ b/service/server/amneziavpn-service.rc.in @@ -0,0 +1,38 @@ +#include +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#define VER_COMPANYNAME_STR "AmneziaVPN" +#define VER_FILEDESCRIPTION_STR "AmneziaVPN Service" +#define VER_INTERNALNAME_STR VER_FILEDESCRIPTION_STR +#define VER_LEGALCOPYRIGHT_STR "AmneziaVPN." +#define VER_LEGALTRADEMARKS1_STR "All Rights Reserved" +#define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR +#define VER_ORIGINALFILENAME_STR "AmneziaVPN-service.exe" +#define VER_PRODUCTNAME_STR VER_FILEDESCRIPTION_STR + +VS_VERSION_INFO VERSIONINFO +FILEVERSION @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@CMAKE_PROJECT_VERSION_TWEAK@ +PRODUCTVERSION @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@ +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", VER_COMPANYNAME_STR + VALUE "FileDescription", VER_FILEDESCRIPTION_STR + VALUE "FileVersion", "@CMAKE_PROJECT_VERSION@" + VALUE "InternalName", VER_INTERNALNAME_STR + VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR + VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR + VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR + VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR + VALUE "ProductName", VER_PRODUCTNAME_STR + VALUE "ProductVersion", "@CMAKE_PROJECT_VERSION@" + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END