Remove WWIV_FULL_RELEASE and fix WWIV_FULL_RELEASE_FILE

wwiv · Dec 22, 2023 · c332a01 · c332a01
1 parent 99f4a54
commit c332a01
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/.github/workflows/wwiv-binaries.yml b/.github/workflows/wwiv-binaries.yml
@@ -83,8 +83,7 @@ jobs:
     env:
       BUILD_NUMBER: ${{needs.wwiv-build-number.outputs.build_number}}
       WWIV_DISTRO: ${{ matrix.wwiv_distro }}
-      WWIV_FULL_RELEASE: "${{ vars.WWIV_RELEASE }}.${{needs.wwiv-build-number.outputs.build_number}}"
-      WWIV_RELEASE_ARCHIVE_FILE: ${{ matrix.wwiv_distro }}-${{ vars.WWIV_RELEASE }}.${{needs.wwiv-build-number.outputs.build_number}}.${{ matrix.archive_suffix }}
+      WWIV_RELEASE_ARCHIVE_FILE: wwiv-${{ matrix.wwiv_distro }}-${{ vars.WWIV_RELEASE }}.${{needs.wwiv-build-number.outputs.build_number}}.${{ matrix.archive_suffix }}
       CMAKE_BINARY_DIR: '${{ github.workspace }}/_build'
       WWIV_RELEASE_DIR: '${{ github.workspace }}/_build/release'
 
@@ -124,7 +123,6 @@ jobs:
           # echo BUILD_NUMBER=${{needs.wwiv-build-number.outputs.build_number}} >> "$GITHUB_ENV"
           # echo WWIV_DISTRO=${{ matrix.wwiv_distro }} >> "$GITHUB_ENV"
           # echo WWIV_RELEASE=${{ env.WWIV_RELEASE }} >> "$GITHUB_ENV"
-          # echo WWIV_FULL_RELEASE="${{ env.WWIV_RELEASE }}.${{needs.wwiv-build-number.outputs.build_number}}" >> "$GITHUB_ENV"
           # echo WWIV_RELEASE_ARCHIVE_FILE=wwiv-${{ matrix.wwiv_distro }}-${{ vars.WWIV_RELEASE }}.${{needs.wwiv-build-number.outputs.build_number}}.${{ matrix.archive_suffix }} >> "$GITHUB_ENV"
           # echo CMAKE_BINARY_DIR='${{ github.workspace }}/_build' >> "$GITHUB_ENV"
           # echo WWIV_RELEASE_DIR='${{ github.workspace }}/_build/release' >> "$GITHUB_ENV"

diff --git a/builds/jenkins/wwiv/build b/builds/jenkins/wwiv/build
@@ -15,7 +15,6 @@ echo "Workspace:        ${WORKSPACE}"
 echo "CMake:            ${CMAKE_BIN}; Test: ${CTEST_BIN}; Pack: ${CPACK_BIN}"
 echo "CMake Build:      ${CMAKE_BINARY_DIR}"
 echo "Release Dir:      ${WWIV_RELEASE_DIR}"
-echo "WWIV Release:     ${WWIV_FULL_RELEASE}"
 echo "Archive:          ${WWIV_RELEASE_ARCHIVE_FILE}"
 echo "WWIV_DISTRO:      ${WWIV_DISTRO}"
 echo "CC:               ${CC}"

diff --git a/builds/jenkins/wwiv/build-os2.cmd b/builds/jenkins/wwiv/build-os2.cmd
@@ -19,8 +19,7 @@ set WWIV_ARCH=x86
 set WWIV_DISTRO=os2
 set ZIP_EXE=7z.exe
 set WWIV_RELEASE=5.7.2
-set WWIV_FULL_RELEASE=%WWIV_RELEASE%.%BUILD_NUMBER%
-set WWIV_RELEASE_ARCHIVE_FILE=wwiv-%WWIV_DISTRO%-%WWIV_FULL_RELEASE%.zip
+set WWIV_RELEASE_ARCHIVE_FILE=wwiv-%WWIV_DISTRO%-%WWIV_RELEASE%.%BUILD_NUMBER%.zip
 set CMAKE_BINARY_DIR=%WORKSPACE%\_build
 set WWIV_RELEASE_DIR=%CMAKE_BINARY_DIR%\release
 

diff --git a/cmake/Common.cmake b/cmake/Common.cmake
@@ -21,10 +21,9 @@ option(WWIV_USE_PIPES "Enable Named Pipes support for WWIV." ON)
 
 set(WWIV_RELEASE "5.9.0" CACHE STRING "WWIV Release Major Version to 3 digits")
 set(WWIV_BUILD_NUMBER "development" CACHE STRING "WWIV Build Number")
-set(WWIV_FULL_RELEASE "${WWIV_RELEASE}.${WWIV_BUILD_NUMBER}" CACHE INTERNAL "WWIV Release Version, 4 digits with build number as 4th")
 set(WWIV_ARCH "x86" CACHE STRING "x86 or x64")
 set(WWIV_DISTRO "unknown" CACHE STRING "WWIV OS Distribution e.g. (win-x86 | linux-debian10) ")
-set(CPACK_PACKAGE_FILE_NAME "wwiv-${WWIV_DISTRO}-${WWIV_FULL_RELEASE}")
+set(CPACK_PACKAGE_FILE_NAME "wwiv-${WWIV_DISTRO}-${WWIV_RELEASE}.${WWIV_BUILD_NUMBER}")
 
 set(WWIV_INSTALL_SRC "${CMAKE_SOURCE_DIR}/install" CACHE STRING "By default this is: ${CMAKE_SOURCE_DIR}/install")
 set(WWIV_RELEASE_DIR "${CMAKE_BINARY_DIR}/release" CACHE STRING "By default this is: ${CMAKE_BINARY_DIR}/release")
@@ -60,7 +59,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "")
 include(CPack)
 
 
-message(STATUS "WWIV Build Number: ${WWIV_FULL_RELEASE}")
+message(STATUS "WWIV Build Number: ${WWIV_RELEASE}.${WWIV_BUILD_NUMBER}")
 
 
 macro(ENSURE_MINIMUM_COMPILER_VERSIONS)

diff --git a/core/version.cpp b/core/version.cpp
@@ -33,8 +33,8 @@ std::string wwiv_compile_datetime() {
 }
 
 std::string full_version() {
-#ifdef WWIV_FULL_RELEASE
-  return WWIV_FULL_RELEASE;
+#ifdef WWIV_RELEASE
+  return fmt::format("{}{}", WWIV_RELEASE, WWIV_BUILD_NUMBER)
 #else
   return {};
 #endif

diff --git a/core/version_internal.h.in b/core/version_internal.h.in
@@ -20,7 +20,6 @@
 
 # cmakedefine WWIV_RELEASE "@WWIV_RELEASE@"
 # cmakedefine WWIV_BUILD_NUMBER "@WWIV_BUILD_NUMBER@"
-# cmakedefine WWIV_FULL_RELEASE "@WWIV_FULL_RELEASE@"
 
 #define INTERNAL_BUILD_DATE __DATE__ ", " __TIME__;