remove redundant name in packaging and use default project name instead

zerotacg · Jul 7, 2024 · a75b418 · a75b418
1 parent 7d1a77d
commit a75b418
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/ci-nel.yml b/.github/workflows/ci-nel.yml
@@ -92,5 +92,5 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: package-${{ needs.strings.outputs.project-name }}-${{ matrix.os }}-${{ needs.strings.outputs.build-version }}
-          path: ${{ needs.strings.outputs.build-output-dir }}/${{ needs.strings.outputs.project-name }}/ryzomcore-*
+          path: ${{ needs.strings.outputs.build-output-dir }}/${{ needs.strings.outputs.project-name }}/${{ needs.strings.outputs.project-name }}-*
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -498,14 +498,12 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ryzom Core MMORPG Framework")
 SET(CPACK_PACKAGE_VENDOR "Ryzom Core")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README.md)
 SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING)
-SET(CPACK_PACKAGE_VERSION_MAJOR "${NL_VERSION_MAJOR}")
-SET(CPACK_PACKAGE_VERSION_MINOR "${NL_VERSION_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${NL_VERSION_PATCH}")
 SET(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};NeL;ALL;/")
 SET(CPACK_PACKAGE_EXECUTABLES "ryzomcore${NL_VERSION}" "ryzomcore")
 
 # NSIS Specific Packing Setup
 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "RyzomCore")
+SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) # to include tweak part of version
 SET(CPACK_NSIS_MODIFY_PATH "ON")
 SET(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/nel/resources/nevraxpill.ico)
 SET(CPACK_NSIS_MUI_UNIICON ${CMAKE_SOURCE_DIR}/nel/resources/nevraxpill.ico)
@@ -516,8 +514,9 @@ SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\dev.ryzom.com\\\\projects\\\\nel\\\\
 SET(CPACK_NSIS_CONTACT "matt.raykowski@gmail.com")
 
 ## Source Packages
-SET(CPACK_PACKAGE_FILE_NAME "ryzomcore-${NL_VERSION}")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "ryzomcore-${NL_VERSION}")
+# remove os part of file name
+SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
 IF(WIN32)
   #SET(CPACK_GENERATOR "NSIS")
   SET(CPACK_GENERATOR "NSIS;ZIP")

diff --git a/cmake/CMakePresets.nel.json b/cmake/CMakePresets.nel.json
@@ -7,7 +7,6 @@
   "configurePresets": [
     {
       "binaryDir": "${sourceDir}/build/nel",
-      "installDir": "${sourceDir}/build/install",
       "name": "nel",
       "cacheVariables": {
         "WITH_STATIC": true,

diff --git a/nelns/CMakeLists.txt b/nelns/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.27)
 
-project(nelns VERSION ${RyzomCore_VERSION} LANGUAGES CXX)
+project(NeLNS VERSION ${RyzomCore_VERSION} LANGUAGES CXX)
 
 find_package(NeL ${RyzomCore_VERSION} REQUIRED COMPONENTS misc net)
 

diff --git a/nelns/CMakePackaging.txt b/nelns/CMakePackaging.txt
@@ -2,9 +2,7 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "NeL MMORPG Framework - Networking Service
 SET(CPACK_PACKAGE_VENDOR "NeL")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README)
 SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING)
-SET(CPACK_PACKAGE_VERSION_MAJOR "${NL_VERSION_MAJOR}")
-SET(CPACK_PACKAGE_VERSION_MINOR "${NL_VERSION_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${NL_VERSION_PATCH}")
+SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) # to include tweak part of version
 SET(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};NeLNS;ALL;/")
 SET(CPACK_PACKAGE_EXECUTABLES "nelns-${NL_VERSION}" "nelns")
 
@@ -29,13 +27,14 @@ SET(CPACK_NSIS_MENU_LINKS
 )
 
 ## Source Packages
-SET(CPACK_PACKAGE_FILE_NAME "nelns-${NL_VERSION}")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "nelns-${NL_VERSION}")
+# remove os part of file name
+SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
 IF(WIN32)
   SET(CPACK_GENERATOR "NSIS")
   SET(CPACK_SOURCE_GENERATOR "ZIP")
 ELSE()
-  SET(CPACK_GENERATOR "TGZ")
+  SET(CPACK_GENERATOR "TGZ;STGZ")
   SET(CPACK_SOURCE_GENERATOR "TGZ")
 ENDIF()
 set(CPACK_SOURCE_IGNORE_FILES