FreeDV
/
freedv-gui
mirror of https://github.com/drowe67/freedv-gui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Consolidate CPack and RC version info in one place.

pull/486/head
Mooneer Salem 2023-08-12 19:47:15 -07:00
parent 87acd231e7
commit cd90ad5c80
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@ -250,7 +250,8 @@ if(MINGW)
include(cmake/MinGW.cmake)
# This sets up the exe icon for windows under mingw.
set(RES_FILES "")
set(RES_FILES "${CMAKE_SOURCE_DIR}/contrib/freedv.rc")
set(RES_FILES "${CMAKE_BINARY_DIR}/freedv.rc")
set(CMAKE_RC_COMPILER_INIT windres)
enable_language(RC)
set(CMAKE_RC_COMPILE_OBJECT
@ -644,19 +645,26 @@ if(WIN32)
set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "DeleteRegKey HKLM 'SOFTWARE\\\\CODEC2-Project\\\\FreeDV'")
set(CPACK_NSIS_MENU_LINKS "share/freedv-gui/USER_MANUAL.pdf" "FreeDV User Manual")
set(CPACK_WIN_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_VER_TWEAK}")
string(TIMESTAMP COPYRIGHT_YEAR "%Y")
set(CPACK_NSIS_DEFINES
"${CPACK_NSIS_DEFINES}
VIProductVersion \\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_VER_TWEAK}\\\"
VIFileVersion \\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_VER_TWEAK}\\\"
VIProductVersion \\\"${CPACK_WIN_VERSION}\\\"
VIFileVersion \\\"${CPACK_WIN_VERSION}\\\"
VIAddVersionKey \\\"ProductName\\\" \\\"FreeDV\\\"
VIAddVersionKey \\\"ProductVersion\\\" \\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_VER_TWEAK}\\\"
VIAddVersionKey \\\"ProductVersion\\\" \\\"${CPACK_WIN_VERSION}\\\"
VIAddVersionKey \\\"Company\\\" \\\"FreeDV\\\"
VIAddVersionKey \\\"LegalCopyright\\\" \\\"Copyright (c) 2023 FreeDV\\\"
VIAddVersionKey \\\"FileDescription\\\" \\\"Digital voice mode for HF radio\\\"
VIAddVersionKey \\\"FileVersion\\\" \\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_VER_TWEAK}\\\"
VIAddVersionKey \\\"LegalCopyright\\\" \\\"Copyright (c) ${COPYRIGHT_YEAR} FreeDV\\\"
VIAddVersionKey \\\"FileDescription\\\" \\\"FreeDV - ${PROJECT_DESCRIPTION}\\\"
VIAddVersionKey \\\"FileVersion\\\" \\\"${CPACK_WIN_VERSION}\\\"
VIAddVersionKey \\\"GitHash\\\" \\\"${FREEDV_HASH}\\\"
")
# Ensures that we don't need to constantly update the rc file on every new release.
string(REPLACE "." "," VERSION_AS_RC ${CPACK_WIN_VERSION})
configure_file(${CMAKE_SOURCE_DIR}/contrib/freedv.rc.in ${CMAKE_BINARY_DIR}/freedv.rc)
if (FREEDV_USING_LLVM_MINGW)
set(CPACK_PACKAGE_FILE_NAME "FreeDV-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-windows-${CMAKE_SYSTEM_PROCESSOR}")
endif (FREEDV_USING_LLVM_MINGW)

14
contrib/freedv.rc → contrib/freedv.rc.in
View File

@ -1,6 +1,6 @@
1 VERSIONINFO
FILEVERSION 1,9,0,0
PRODUCTVERSION 1,9,0,0
FILEVERSION @VERSION_AS_RC@
PRODUCTVERSION @VERSION_AS_RC@
FILEFLAGSMASK 0x00000000
FILEOS 0x00000001
FILETYPE 0x00000001
@ -10,13 +10,13 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "FreeDV\0"
VALUE "FileDescription", "Digital voice mode for HF radio\0"
VALUE "FileVersion", "1.9.0\0"
VALUE "FileDescription", "FreeDV - @PROJECT_DESCRIPTION@\0"
VALUE "FileVersion", "@CPACK_WIN_VERSION@\0"
VALUE "InternalName", "FreeDV\0"
VALUE "LegalCopyright", "Copyright (c) 2023 FreeDV\0"
VALUE "LegalCopyright", "Copyright (c) @COPYRIGHT_YEAR@ FreeDV\0"
VALUE "LegalTrademarks", "\0"
VALUE "ProductName", "FreeDV\0"
VALUE "ProductVersion", "1.9.0\0"
VALUE "ProductVersion", "@CPACK_WIN_VERSION@\0"
END
END
BLOCK "VarFileInfo"
@ -25,4 +25,4 @@ BEGIN
END
END
id ICON "./freedv.ico"
id ICON "@CMAKE_SOURCE_DIR@/contrib/freedv.ico"