smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: rm DESKFLOW_AUTHOR_NAME define

Browse source
This commit is contained in:
sithlord48 2024-10-28 17:11:21 -04:00 committed by Nick Bolton
parent 403830ceea
commit b5d0417714
5 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/Definitions.cmake
View file

@ -54,10 +54,6 @@ endmacro()
macro(configure_meta) macro(configure_meta)
set(DESKFLOW_AUTHOR_NAME
"Deskflow"
CACHE STRING "Author name (also used as organization name)")
set(DESKFLOW_MAINTAINER set(DESKFLOW_MAINTAINER
"Deskflow <maintainers@deskflow.org>" "Deskflow <maintainers@deskflow.org>"
CACHE STRING "Maintainer email address in RFC 5322 mailbox format") CACHE STRING "Maintainer email address in RFC 5322 mailbox format")
@ -86,7 +82,6 @@ macro(configure_meta)
true true
CACHE BOOL "Show developer thanks message") CACHE BOOL "Show developer thanks message")
message(VERBOSE "Author name: ${DESKFLOW_AUTHOR_NAME}")
message(VERBOSE "Maintainer: ${DESKFLOW_MAINTAINER}") message(VERBOSE "Maintainer: ${DESKFLOW_MAINTAINER}")
message(VERBOSE "Website URL: ${DESKFLOW_WEBSITE_URL}") message(VERBOSE "Website URL: ${DESKFLOW_WEBSITE_URL}")
message(VERBOSE "Version URL: ${DESKFLOW_VERSION_URL}") message(VERBOSE "Version URL: ${DESKFLOW_VERSION_URL}")
@ -96,7 +91,6 @@ macro(configure_meta)
message(VERBOSE "Show dev thanks: ${DESKFLOW_SHOW_DEV_THANKS}") message(VERBOSE "Show dev thanks: ${DESKFLOW_SHOW_DEV_THANKS}")
# TODO: We need to move this to configure_file() in the future, which is much cleaner. # TODO: We need to move this to configure_file() in the future, which is much cleaner.
add_definitions(-DDESKFLOW_AUTHOR_NAME="${DESKFLOW_AUTHOR_NAME}")
add_definitions(-DDESKFLOW_MAINTAINER="${DESKFLOW_MAINTAINER}") add_definitions(-DDESKFLOW_MAINTAINER="${DESKFLOW_MAINTAINER}")
add_definitions(-DDESKFLOW_WEBSITE_URL="${DESKFLOW_WEBSITE_URL}") add_definitions(-DDESKFLOW_WEBSITE_URL="${DESKFLOW_WEBSITE_URL}")
add_definitions(-DDESKFLOW_VERSION_URL="${DESKFLOW_VERSION_URL}") add_definitions(-DDESKFLOW_VERSION_URL="${DESKFLOW_VERSION_URL}")

2
cmake/Packaging.cmake
View file

@ -16,7 +16,7 @@ macro(configure_packaging)
set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
set(CPACK_PACKAGE_CONTACT ${DESKFLOW_MAINTAINER}) set(CPACK_PACKAGE_CONTACT ${DESKFLOW_MAINTAINER})
set(CPACK_PACKAGE_DESCRIPTION ${CMAKE_PROJECT_DESCRIPTION}) set(CPACK_PACKAGE_DESCRIPTION ${CMAKE_PROJECT_DESCRIPTION})
set(CPACK_PACKAGE_VENDOR ${DESKFLOW_AUTHOR_NAME}) set(CPACK_PACKAGE_VENDOR "Deskflow")
set(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE) set(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE)
set(CPACK_PACKAGE_VERSION ${CMAKE_PROJECT_VERSION}) set(CPACK_PACKAGE_VERSION ${CMAKE_PROJECT_VERSION})

2
deploy/dist/wix/Include.wxi.in vendored
View file

@ -3,7 +3,7 @@
<?define AppId="deskflow"?> <?define AppId="deskflow"?>
<?define Name="Deskflow"?> <?define Name="Deskflow"?>
<?define Version="@DESKFLOW_VERSION@"?> <?define Version="@DESKFLOW_VERSION@"?>
<?define Author="@DESKFLOW_AUTHOR_NAME@"?> <?define Author="Deskflow"?>
<?define BinDir="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"?> <?define BinDir="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"?>
<?define ProjectIcon="@CMAKE_SOURCE_DIR@/src/gui/src/deskflow.ico"?> <?define ProjectIcon="@CMAKE_SOURCE_DIR@/src/gui/src/deskflow.ico"?>
<?define DeployResDir="@DESKFLOW_DEPLOY_RES_DIR@"?> <?define DeployResDir="@DESKFLOW_DEPLOY_RES_DIR@"?>

2
deploy/version.rc.in
View file

@ -12,7 +12,7 @@ https://learn.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource?redi
#define VER_PRODUCTVERSION @DESKFLOW_VERSION_MS_CSV@ #define VER_PRODUCTVERSION @DESKFLOW_VERSION_MS_CSV@
#define VER_PRODUCTVERSION_STR "@DESKFLOW_VERSION@\0" #define VER_PRODUCTVERSION_STR "@DESKFLOW_VERSION@\0"
#define VER_COMPANYNAME_STR "@DESKFLOW_AUTHOR_NAME@\0" #define VER_COMPANYNAME_STR "Deskflow\0"
#define VER_FILEDESCRIPTION_STR "Deskflow\0" #define VER_FILEDESCRIPTION_STR "Deskflow\0"
#define VER_INTERNALNAME_STR "Deskflow\0" #define VER_INTERNALNAME_STR "Deskflow\0"
#define VER_LEGALCOPYRIGHT_STR "© 2024 Deskflow Developers\0" #define VER_LEGALCOPYRIGHT_STR "© 2024 Deskflow Developers\0"

3
src/lib/deskflow/win32/AppUtilWindows.cpp
View file

@ -255,7 +255,8 @@ void AppUtilWindows::showNotification(const String &title, const String &text) c
WinToastLib::WinToast::instance()->setAppName(L"" WinToastLib::WinToast::instance()->setAppName(L""
"Deskflow"); "Deskflow");
const auto aumi = WinToastLib::WinToast::configureAUMI( const auto aumi = WinToastLib::WinToast::configureAUMI(
L"" DESKFLOW_AUTHOR_NAME, L""
"Deskflow Developers",
L"" L""
"Deskflow", "Deskflow",
L"" L""