BlockStorage/repertory
1
0
Fork 0
Code Issues 7 Pull Requests Releases 6 Wiki Activity

version handling

Browse Source
This commit is contained in:
Scott E. Graves 2024-07-09 12:38:10 -05:00
parent 466b3fcead
commit 097507a2d9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project.cmake
View File

@ -3,7 +3,7 @@ set(REPERTORY_MINOR 0)
set(REPERTORY_REV 2) set(REPERTORY_REV 2)
set(REPERTORY_RELEASE_NUM 0) set(REPERTORY_RELEASE_NUM 0)
set(REPERTORY_RELEASE_ITER rc) set(REPERTORY_RELEASE_ITER rc)
set(REPERTORY_VERSION ${REPERTORY_MAJOR}.${REPERTORY_MINOR}.${REPERTORY_REV}-${REPERTORY_RELEASE_ITER}) set(PROJECT_VERSION ${REPERTORY_MAJOR}.${REPERTORY_MINOR}.${REPERTORY_REV}-${REPERTORY_RELEASE_ITER})
set(REPERTORY_VER_FILEVERSION ${REPERTORY_MAJOR},${REPERTORY_MINOR},${REPERTORY_REV},${REPERTORY_RELEASE_NUM}) set(REPERTORY_VER_FILEVERSION ${REPERTORY_MAJOR},${REPERTORY_MINOR},${REPERTORY_REV},${REPERTORY_RELEASE_NUM})
set(REPERTORY_VER_FILEVERSION_STR ${REPERTORY_MAJOR}.${REPERTORY_MINOR}.${REPERTORY_REV}.${REPERTORY_RELEASE_NUM}) set(REPERTORY_VER_FILEVERSION_STR ${REPERTORY_MAJOR}.${REPERTORY_MINOR}.${REPERTORY_REV}.${REPERTORY_RELEASE_NUM})

2
repertory/librepertory/src/common.cpp.in
View File

@ -29,7 +29,7 @@ auto get_repertory_git_revision() -> const std::string & {
} }
auto get_repertory_version() -> const std::string & { auto get_repertory_version() -> const std::string & {
static const std::string version = "@REPERTORY_VERSION@"; static const std::string version = "@PROJECT_VERSION@";
return version; return version;
} }
} // namespace repertory } // namespace repertory

4
repertory/repertory/version.rc.in
View File

@ -6,13 +6,13 @@
#define VER_PRODUCTVERSION_STR "@REPERTORY_VER_PRODUCTVERSION_STR@\0" #define VER_PRODUCTVERSION_STR "@REPERTORY_VER_PRODUCTVERSION_STR@\0"
#define VER_COMPANYNAME_STR "@REPERTORY_VER_COMPANYNAME_STR@\0" #define VER_COMPANYNAME_STR "@REPERTORY_VER_COMPANYNAME_STR@\0"
#define VER_INTERNALNAME_STR "Repertory @REPERTORY_VERSION@\0" #define VER_INTERNALNAME_STR "Repertory @PROJECT_VERSION@\0"
#define VER_LEGALCOPYRIGHT_STR "@REPERTORY_VER_LEGALCOPYRIGHT_STR@\0" #define VER_LEGALCOPYRIGHT_STR "@REPERTORY_VER_LEGALCOPYRIGHT_STR@\0"
#define VER_ORIGINALFILENAME_STR "repertory.exe\0" #define VER_ORIGINALFILENAME_STR "repertory.exe\0"
#define VER_LEGALTRADEMARKS1_STR "\0" #define VER_LEGALTRADEMARKS1_STR "\0"
#define VER_LEGALTRADEMARKS2_STR "\0" #define VER_LEGALTRADEMARKS2_STR "\0"
#define VER_FILEDESCRIPTION_STR "@REPERTORY_VER_FILEDESCRIPTION_STR@\0" #define VER_FILEDESCRIPTION_STR "@REPERTORY_VER_FILEDESCRIPTION_STR@\0"
#define VER_PRODUCTNAME_STR "Repertory v@REPERTORY_VERSION@\0" #define VER_PRODUCTNAME_STR "Repertory @PROJECT_VERSION@\0"
#ifdef DEBUG #ifdef DEBUG
#define VER_DEBUG VS_FF_DEBUG #define VER_DEBUG VS_FF_DEBUG