gearmulator

commit c2453d904da63c1d7715353f6fbdc66dcc7fd9b6
parent 4b531e63fc39492e0107f8c8d3c9f167b6575572
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Sat, 20 Apr 2024 21:05:09 +0200

support file filters in deploy/upload script

Diffstat:
M
scripts/deploy.cmake
 | 
16
++++++++--------
M
scripts/rclone.cmake
 | 
4
++--

2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/scripts/deploy.cmake b/scripts/deploy.cmake
@@ -8,13 +8,13 @@ if(NOT UPLOAD_LOCAL AND NOT UPLOAD_REMOTE)
 	message(FATAL_ERROR "neither upload to local nor remote is set")
 endif()
 
-if(EXISTS ${RCLONE_CONF})
-	if(UPLOAD_LOCAL)
-		copyArtefacts("dsp56300:deploy" ${FOLDER})
-	endif()
-	if(UPLOAD_REMOTE)
-		copyArtefacts("dsp56300_ftp:builds" ${FOLDER})
-	endif()
-else()
+if(NOT EXISTS ${RCLONE_CONF})
 	message(FATAL_ERROR "rclone.conf not found, unable to deploy/upload")
 endif()
+
+if(UPLOAD_LOCAL)
+	copyArtefacts("dsp56300:deploy" ${FOLDER} "")
+endif()
+if(UPLOAD_REMOTE)
+	copyArtefacts("dsp56300_ftp:builds" ${FOLDER} "")
+endif()
diff --git a/scripts/rclone.cmake b/scripts/rclone.cmake
@@ -12,9 +12,9 @@ endif()
 
 set(postfix "_partial")
 
-macro(copyArtefacts TARGET FOLDER)
+macro(copyArtefacts TARGET FOLDER FILEFILTER)
 	set(RCLONE_RESULT 0)
-	file(GLOB files LIST_DIRECTORIES false "${ROOT_DIR}/*.zip" "${ROOT_DIR}/*.deb" "${ROOT_DIR}/*.rpm")
+	file(GLOB files LIST_DIRECTORIES false "${ROOT_DIR}/*${FILEFILTER}*.zip" "${ROOT_DIR}/*${FILEFILTER}*.deb" "${ROOT_DIR}/*${FILEFILTER}*.rpm")
 	foreach(fileLocal ${files})
 		
 		file(SIZE ${fileLocal} fileSize)