From f2ab48a210b5208672150ed928f54e50043f0279 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Mon, 4 Nov 2024 11:05:41 +0100
Subject: [PATCH] NXCals: work around issue caused by .sys.. files appearing on
EOS
---
cmake/toolchain/nxcals.cmake | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake/toolchain/nxcals.cmake b/cmake/toolchain/nxcals.cmake
index 46efd71e30..c87bc92dd3 100644
--- a/cmake/toolchain/nxcals.cmake
+++ b/cmake/toolchain/nxcals.cmake
@@ -2,8 +2,8 @@ set(NXCALS_LS_COMMAND "xrdfs root://eosproject.cern.ch ls ")
set(NXCALS_CP_COMMAND "xrdcp")
set(NXCALS_MGM_URL root://eosproject.cern.ch://)
-set(PATTERN_NXCALS_JAVA "data-access-libs")
-set(PATTERN_NXCALS_PYTHON "extraction_api_python3-")
+set(PATTERN_NXCALS_JAVA "nxcals-data-access-libs")
+set(PATTERN_NXCALS_PYTHON "nxcals_extraction_api_python3-")
# a number followed by repeated (a dot followed by numbers or rc or b or (dev0) or letters or both)
set(NXCALS_VERSION_MATCH "[0-9]((\\.|rc|b|)((dev)?[0-9]+)+)+")
@@ -13,8 +13,8 @@ execute_process(COMMAND $ENV{SHELL} -c "python3 -m pip install --upgrade --user
execute_process(COMMAND $ENV{SHELL} -c "${NXCALS_LS_COMMAND} ${EOS_PATH_NXCALS_DEV}" OUTPUT_VARIABLE NXCALS_CONTENT OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND $ENV{SHELL} -c "${NXCALS_LS_COMMAND} ${EOS_PATH_NXCALS_DEV} | grep ${PATTERN_NXCALS_JAVA} | grep -Eo \'${NXCALS_VERSION_MATCH}\'" OUTPUT_VARIABLE NXCALS_JAVA_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND $ENV{SHELL} -c "${NXCALS_LS_COMMAND} ${EOS_PATH_NXCALS_DEV} | grep ${PATTERN_NXCALS_PYTHON} | grep -Eo \'${NXCALS_VERSION_MATCH}\'" OUTPUT_VARIABLE NXCALS_PYTHON_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND $ENV{SHELL} -c "${NXCALS_LS_COMMAND} ${EOS_PATH_NXCALS_DEV}/${PATTERN_NXCALS_JAVA}* | grep -Eo \'${NXCALS_VERSION_MATCH}\'" OUTPUT_VARIABLE NXCALS_JAVA_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND $ENV{SHELL} -c "${NXCALS_LS_COMMAND} ${EOS_PATH_NXCALS_DEV}/${PATTERN_NXCALS_PYTHON}* | grep -Eo \'${NXCALS_VERSION_MATCH}\'" OUTPUT_VARIABLE NXCALS_PYTHON_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
MESSAGE(STATUS "Content of NXCals folder is\n********\n${NXCALS_CONTENT}\n********")
MESSAGE(STATUS "And we grepped the versions\n********\ndata-access-libs ${NXCALS_JAVA_VERSION}\nextraction-api: ${NXCALS_PYTHON_VERSION}\n********")
--
GitLab