From a870dca8fb46b257d545db77da507b0074fdfc86 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Fri, 31 Jan 2025 11:39:45 +0100
Subject: [PATCH] Add removed RELEASE file from artifacts by putting it into
 Packages folder, and for saving space.

---
 .gitlab-ci-files/linux-desktop-ubuntu-2004.yml | 4 ++--
 .gitlab-ci-files/macosx-desktop.yml            | 4 ++--
 .gitlab-ci-files/windows-desktop.yml           | 4 ++--
 cmake/install/install.cmake                    | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml b/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
index f07dbc390..7d6d1bf88 100644
--- a/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
+++ b/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
@@ -151,8 +151,8 @@ ubuntu2004-makefile-gcc-deploy:
    - rsync -rlv --ignore-existing build/OUTPUT/Packages/*.AppImage $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM/$APP_FOLDER
    - |-
      if [[ $MAKE_RELEASE_FILE_URL != "" ]]; then
-       rsync -rlv build/OUTPUT/RELEASE $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM
-       rsync -rlv build/OUTPUT/RELEASE $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM
+       rsync -rlv build/OUTPUT/Packages/RELEASE $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM
+       rsync -rlv build/OUTPUT/Packages/RELEASE $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM
      fi
 
 
diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml
index 661c13fc8..8f2ff9999 100644
--- a/.gitlab-ci-files/macosx-desktop.yml
+++ b/.gitlab-ci-files/macosx-desktop.yml
@@ -151,8 +151,8 @@ macosx-deploy:
    - rsync -rlv --ignore-existing build/OUTPUT/macos/Packages/Linphone*.dmg $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM/$APP_FOLDER
    - |-
      if [[ $MAKE_RELEASE_FILE_URL != "" ]]; then
-       rsync -rlv build/OUTPUT/macos/RELEASE $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM
-       rsync -rlv build/OUTPUT/macos/RELEASE $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM
+       rsync -rlv build/OUTPUT/macos/Packages/RELEASE $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM
+       rsync -rlv build/OUTPUT/macos/Packages/RELEASE $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM
      fi
 
 
diff --git a/.gitlab-ci-files/windows-desktop.yml b/.gitlab-ci-files/windows-desktop.yml
index d6354d8ce..9ee55c2df 100644
--- a/.gitlab-ci-files/windows-desktop.yml
+++ b/.gitlab-ci-files/windows-desktop.yml
@@ -235,8 +235,8 @@ win64-codesigning:
 
   script:
     - scp -pr build-desktop/OUTPUT/Packages/*.exe ${DEPLOY_SERVER}:${UPLOAD_ROOT_PATH}/${WINDOWS_PLATFORM}/${APP_FOLDER}
-    - if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/RELEASE ${DEPLOY_SERVER}:${UPLOAD_ROOT_PATH}/${WINDOWS_PLATFORM}/ }
-    - if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/RELEASE ${MAIN_DEPLOY_SERVER}:${UPLOAD_ROOT_PATH}/${WINDOWS_PLATFORM}/ }
+    - if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/Packages/RELEASE ${DEPLOY_SERVER}:${UPLOAD_ROOT_PATH}/${WINDOWS_PLATFORM}/ }
+    - if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/Packages/RELEASE ${MAIN_DEPLOY_SERVER}:${UPLOAD_ROOT_PATH}/${WINDOWS_PLATFORM}/ }
 
 win64-ninja-vs2022-upload:
   extends:
diff --git a/cmake/install/install.cmake b/cmake/install/install.cmake
index 4c97ff0b9..66bb9a845 100644
--- a/cmake/install/install.cmake
+++ b/cmake/install/install.cmake
@@ -304,6 +304,7 @@ if(${ENABLE_APP_PACKAGING})
 	install(SCRIPT "${CMAKE_BINARY_DIR}/cmake/install/packaging.cmake")
 	if(LINPHONE_SDK_MAKE_RELEASE_FILE_URL)
 		bc_make_release_file("${LINPHONEAPP_VERSION}" "${LINPHONE_SDK_MAKE_RELEASE_FILE_URL}/${CPACK_PACKAGE_FILE_NAME}.${PACKAGE_EXT}")
+		file(RENAME "${CMAKE_INSTALL_PREFIX}/RELEASE" "${CMAKE_INSTALL_PREFIX}/Packages/RELEASE")
 	endif()
 	include(CPack)
 endif()