From 6ab7386a79ba0335b6a0580bb5bda410a9a75f84 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Wed, 17 Jul 2024 09:18:04 -0500
Subject: [PATCH] updated build system

---
 CMakeLists.txt           | 1 -
 repertory/version.cpp.in | 3 ++-
 repertory/version.rc.in  | 8 ++++----
 scripts/env.sh           | 4 ----
 scripts/make_package.sh  | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c47c175..14cc6187 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,6 +138,5 @@ endif()
       -DPROJECT_STATIC_LINK=${PROJECT_STATIC_LINK}
       -DPROJECT_TOOLCHAIN_FILE_CMAKE=${PROJECT_TOOLCHAIN_FILE_CMAKE}
       -DPROJECT_TOOLCHAIN_FILE_MESON=${PROJECT_TOOLCHAIN_FILE_MESON}
-      -DPROJECT_VERSION=${PROJECT_VERSION}
   )
 endif()
diff --git a/repertory/version.cpp.in b/repertory/version.cpp.in
index 7172faa7..0dc2c825 100644
--- a/repertory/version.cpp.in
+++ b/repertory/version.cpp.in
@@ -3,7 +3,8 @@
 namespace {
 static constexpr const std::string_view git_rev = "@PROJECT_GIT_REV@";
 static constexpr const std::string_view version =
-    "@PROJECT_VERSION@-@PROJECT_RELEASE_ITER@";
+    "@PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@"
+    "-@PROJECT_RELEASE_ITER@";
 } // namespace
 
 namespace repertory {
diff --git a/repertory/version.rc.in b/repertory/version.rc.in
index 7b84744d..f9b07af1 100644
--- a/repertory/version.rc.in
+++ b/repertory/version.rc.in
@@ -1,18 +1,18 @@
 #include <windows.h>
 #define VER_FILEVERSION             @PROJECT_MAJOR_VERSION@,@PROJECT_MINOR_VERSION@,@PROJECT_REVISION_VERSION@,@PROJECT_RELEASE_NUM@
-#define VER_FILEVERSION_STR         "@PROJECT_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
+#define VER_FILEVERSION_STR         "@PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
 
 #define VER_PRODUCTVERSION          @PROJECT_MAJOR_VERSION@,@PROJECT_MINOR_VERSION@,@PROJECT_REVISION_VERSION@,@PROJECT_RELEASE_NUM@
-#define VER_PRODUCTVERSION_STR      "@PROJECT_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
+#define VER_PRODUCTVERSION_STR      "@PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
 
 #define VER_COMPANYNAME_STR         "@PROJECT_COMPANY_NAME@\0"
-#define VER_INTERNALNAME_STR        "@PROJECT_NAME@ @PROJECT_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
+#define VER_INTERNALNAME_STR        "@PROJECT_NAME@ @PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
 #define VER_LEGALCOPYRIGHT_STR      "@PROJECT_COPYRIGHT@\0"
 #define VER_ORIGINALFILENAME_STR    "@PROJECT_NAME@.exe\0"
 #define VER_LEGALTRADEMARKS1_STR    "\0"
 #define VER_LEGALTRADEMARKS2_STR    "\0"  
 #define VER_FILEDESCRIPTION_STR     "@PROJECT_DESCRIPTION@\0"  
-#define VER_PRODUCTNAME_STR         "@PROJECT_NAME@ @PROJECT_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
+#define VER_PRODUCTNAME_STR         "@PROJECT_NAME@ @PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
 
 #ifdef DEBUG                                    
 #define VER_DEBUG                   VS_FF_DEBUG
diff --git a/scripts/env.sh b/scripts/env.sh
index 8dfe8db0..5c0d033c 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -62,7 +62,6 @@ if [ "${PROJECT_IS_MINGW_UNIX}" == "" ]; then
 fi
 
 . "${SOURCE_DIR}/config.sh"
-PROJECT_VERSION=${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_REVISION_VERSION}-${PROJECT_RELEASE_ITER}
 
 if [ "${PROJECT_ENABLE_SFML}" == "ON" ]; then
   PROJECT_ENABLE_FLAC=ON
@@ -227,7 +226,6 @@ PROJECT_CMAKE_OPTS="-DPROJECT_REVISION_VERSION=${PROJECT_REVISION_VERSION} ${PRO
 PROJECT_CMAKE_OPTS="-DPROJECT_STATIC_LINK=${PROJECT_STATIC_LINK} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_TOOLCHAIN_FILE_CMAKE=${PROJECT_TOOLCHAIN_FILE_CMAKE} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_TOOLCHAIN_FILE_MESON=${PROJECT_TOOLCHAIN_FILE_MESON} ${PROJECT_CMAKE_OPTS}"
-PROJECT_CMAKE_OPTS="-DPROJECT_VERSION=${PROJECT_VERSION} ${PROJECT_CMAKE_OPTS}"
 
 for PROJECT_LIBRARY in "${PROJECT_LIBRARIES[@]}"; do
   ENABLE_NAME=PROJECT_ENABLE_${PROJECT_LIBRARY}
@@ -289,7 +287,6 @@ export PROJECT_REVISION_VERSION
 export PROJECT_STATIC_LINK
 export PROJECT_TOOLCHAIN_FILE_CMAKE
 export PROJECT_TOOLCHAIN_FILE_MESON
-export PROJECT_VERSION
 export SOURCE_DIR
 
 for PROJECT_LIBRARY in "${PROJECT_LIBRARIES[@]}"; do
@@ -330,7 +327,6 @@ echo "  Require Alpine: ${PROJECT_REQUIRE_ALPINE}"
 echo "  Static link: ${PROJECT_STATIC_LINK}"
 echo "  Third-party dir: ${PROJECT_3RD_PARTY_DIR}"
 echo "  Unit testing enabled: ${PROJECT_ENABLE_TESTING}"
-echo "  Version: ${PROJECT_VERSION}-${PROJECT_GIT_REV}"
 echo "-=[Libraries]=-"
 for PROJECT_LIBRARY in "${PROJECT_LIBRARIES[@]}"; do
   ENABLE_NAME=PROJECT_ENABLE_${PROJECT_LIBRARY}
diff --git a/scripts/make_package.sh b/scripts/make_package.sh
index 8e76e951..0a8069d4 100755
--- a/scripts/make_package.sh
+++ b/scripts/make_package.sh
@@ -35,7 +35,7 @@ PACKAGE_ROOT=$(realpath "${PACKAGE_ROOT}")
 rsync -av --progress ${PROJECT_DIST_DIR}/ ${TEMP_DIR}/${PROJECT_NAME}/ || exit_and_clean "Failed to rsync" 1
 
 pushd "${DEST_DIR}"
-OUT_FILE=${PROJECT_NAME}_${PROJECT_VERSION}_${PROJECT_GIT_REV}_${PROJECT_BUILD_ARCH}_${PROJECT_OS}.tar.gz
+OUT_FILE=${PROJECT_NAME}_${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_REVISION_VERSION}-${PROJECT_RELEASE_ITER}-${PROJECT_GIT_REV}_${PROJECT_BUILD_ARCH}_${PROJECT_OS}.tar.gz
 tar cvzf "${OUT_FILE}" -C ${TEMP_DIR} . || exit_and_clean "Failed to create archive" 1
 sha256sum "${OUT_FILE}" >"${OUT_FILE}.sha256" || exit_and_clean "Failed to create sha256 file" 1
 if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then