CMake: DA rpm creation, enable more detectors from the same folder

Possibility to create DAs for more than one detector from a DA folder
ALIROOT-5850

diff --git a/PHOS/DA/CMakeLists.txt b/PHOS/DA/CMakeLists.txt
index 27dc95809e5bb9499beff1582c05f99bb4eea6ff..7079a037190a5dd90c424d4a0e76c776f65d8a2c 100644 (file)
--- a/PHOS/DA/CMakeLists.txt
+++ b/PHOS/DA/CMakeLists.txt
@@ -41,10 +41,10 @@ set(STATIC_DEPENDENCIES RAWDatabase-static RAWDatarec-static STEERBase-static)
 generateDA("PHOS" "PED" "${STATIC_DEPENDENCIES}")
 
 set(STATIC_DEPENDENCIES PHOSbase-static RAWDatabase-static RAWDatarec-static STEERBase-static)
-generateDA("PHOS" "CPVPED" "${STATIC_DEPENDENCIES}")
+generateDA("CPV" "PED" "${STATIC_DEPENDENCIES}")
 
 set(STATIC_DEPENDENCIES PHOSbase-static RAWDatabase-static RAWDatarec-static STEERBase-static)
-generateDA("PHOS" "CPVBCM" "${STATIC_DEPENDENCIES}")
+generateDA("CPV" "BCM" "${STATIC_DEPENDENCIES}")
 
 set(STATIC_DEPENDENCIES PHOSbase-static RAWDatabase-static RAWDatarec-static STEERBase-static)
-generateDA("PHOS" "CPVGAIN" "${STATIC_DEPENDENCIES}")
+generateDA("CPV" "GAIN" "${STATIC_DEPENDENCIES}")

diff --git a/PHOS/DA/PHOSCPVBCMda.cxx b/PHOS/DA/CPVBCMda.cxx
similarity index 100%
rename from PHOS/DA/PHOSCPVBCMda.cxx
rename to PHOS/DA/CPVBCMda.cxx

diff --git a/PHOS/DA/PHOSCPVGAINda.cxx b/PHOS/DA/CPVGAINda.cxx
similarity index 100%
rename from PHOS/DA/PHOSCPVGAINda.cxx
rename to PHOS/DA/CPVGAINda.cxx

diff --git a/PHOS/DA/PHOSCPVPEDda.cxx b/PHOS/DA/CPVPEDda.cxx
similarity index 100%
rename from PHOS/DA/PHOSCPVPEDda.cxx
rename to PHOS/DA/CPVPEDda.cxx

diff --git a/cmake/CMakeALICE.cmake b/cmake/CMakeALICE.cmake
index e9c90e15faa839c13b31513095854688da2bda5a..60a12b46b3478f12aef6168b91ca3ef5b82d0528 100644 (file)
--- a/cmake/CMakeALICE.cmake
+++ b/cmake/CMakeALICE.cmake
@@ -218,12 +218,12 @@ macro(createDArpm DETECTOR ALGORITHM)
         set(DA_NAME "daqDA-${DETECTOR}-${ALGORITHM}")
     endif()
 
-    configure_file("${AliRoot_SOURCE_DIR}/cmake/da.spec.in" "${_ALGORITHM}-da.spec" @ONLY)
+    configure_file("${AliRoot_SOURCE_DIR}/cmake/da.spec.in" "${DETECTOR}${_ALGORITHM}-da.spec" @ONLY)
 
     add_custom_command(TARGET ${DETECTOR}${ALGORITHM}da.exe POST_BUILD
-                       COMMAND mkdir ARGS -p da-${_ALGORITHM}-rpm/root/${DA_PREFIX}/
-                       COMMAND cp ARGS ${DETECTOR}${ALGORITHM}da.exe da-${_ALGORITHM}-rpm/root/${DA_PREFIX}/
-                       COMMAND rpmbuild ARGS --verbose --define "_topdir ${CMAKE_CURRENT_BINARY_DIR}/da-${_ALGORITHM}-rpm" --define "%buildroot ${CMAKE_CURRENT_BINARY_DIR}/da-${_ALGORITHM}-rpm/root" -bb ${_ALGORITHM}-da.spec
+                       COMMAND mkdir ARGS -p da-${DETECTOR}${_ALGORITHM}-rpm/root/${DA_PREFIX}/
+                       COMMAND cp ARGS ${DETECTOR}${ALGORITHM}da.exe da-${DETECTOR}${_ALGORITHM}-rpm/root/${DA_PREFIX}/
+                       COMMAND rpmbuild ARGS --verbose --define "_topdir ${CMAKE_CURRENT_BINARY_DIR}/da-${DETECTOR}${_ALGORITHM}-rpm" --define "%buildroot ${CMAKE_CURRENT_BINARY_DIR}/da-${DETECTOR}${_ALGORITHM}-rpm/root" -bb ${DETECTOR}${_ALGORITHM}-da.spec
                        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} VERBATIM
                        COMMENT "RPM creation for ${DETECTOR}-${_ALGORITHM}"
     )
@@ -231,11 +231,11 @@ macro(createDArpm DETECTOR ALGORITHM)
     # make clean will remove also the rpm folder
     # Retrive the current list of file to be deleted - set_directory_property is overwriting, not adding to the list
     get_directory_property(_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
-    set(_clean_files da-${_ALGORITHM}-rpm  ${_clean_files})
+    set(_clean_files da-${DETECTOR}${_ALGORITHM}-rpm  ${_clean_files})
     set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${_clean_files}")
     
     # install RPM into $CMAKE_INSTALL_PREFIX/darpms
-    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/da-${_ALGORITHM}-rpm/RPMS/ DESTINATION darpms PATTERN "\\.rpm")
+    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/da-${DETECTOR}${_ALGORITHM}-rpm/RPMS/ DESTINATION darpms PATTERN "\\.rpm")
 endmacro()
 
 

diff --git a/cmake/da.spec.in b/cmake/da.spec.in
index 1e878082acba1b4a53263733498d981bcc59eb00..270e4d372fc2a5d1d18c52f66f8b0e9087350280 100644 (file)
--- a/cmake/da.spec.in
+++ b/cmake/da.spec.in
@@ -6,7 +6,7 @@ Release: @GIT_SHORT_SHA1@
 License: CERN Alice DAQ/Offine
 Group: Applications/Alice
 Prefix: /opt/%{name}
-BuildRoot: /@CMAKE_CURRENT_BINARY_DIR@/da-@_ALGORITHM@-rpm/root
+BuildRoot: /@CMAKE_CURRENT_BINARY_DIR@/da-@DETECTOR@@_ALGORITHM@-rpm/root
 Packager: Alina Grigoras <alina.gabriela.grigoras@cern.ch>
 
 # automatic dependencies