diff --git a/CMakeLists.txt b/CMakeLists.txt index a1a09f3..6c87fa0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ cmake_minimum_required (VERSION 3.19 FATAL_ERROR) find_package(cetmodules 3.16.00 REQUIRED) -project(otsdaq_mu2e_stm VERSION 3.03.01) +project(otsdaq-mu2e-stm VERSION 3.03.01) include(CetCMakeEnv) cet_cmake_env() diff --git a/otsdaq-mu2e-stm/FEInterfaces/CMakeLists.txt b/otsdaq-mu2e-stm/FEInterfaces/CMakeLists.txt index bb64301..00dab95 100644 --- a/otsdaq-mu2e-stm/FEInterfaces/CMakeLists.txt +++ b/otsdaq-mu2e-stm/FEInterfaces/CMakeLists.txt @@ -1,7 +1,7 @@ include(otsdaq::FEInterface) -cet_build_plugin(ROCStoppingTargetMonitorInterface otsdaq::FEInterface LIBRARIES REG otsdaq_mu2e::ROCCore +cet_build_plugin(ROCStoppingTargetMonitorInterface otsdaq::FEInterface LIBRARIES REG otsdaq-mu2e::ROCCore ) install_headers() diff --git a/ups/product_deps b/ups/product_deps deleted file mode 100644 index b7e7570..0000000 --- a/ups/product_deps +++ /dev/null @@ -1,54 +0,0 @@ -# The parent line must be the first non-comment line in the file -# This line defines the product name and version -parent otsdaq_mu2e_stm -defaultqual e20:s128 - -# These optional lines define the installed directories where -# headers, libraries, and executables will be found -# Use them only if your product does not conform to the defaults -# Format: directory_type directory_path directory_name -# The only recognized values of the first field are incdir, libdir, and bindir -# The only recognized values of the second field are product_dir and fq_dir -# The third field is not constrained -# The examples here reflect the defaults -incdir product_dir include -libdir fq_dir lib -bindir fq_dir bin -fcldir fq_dir fcl - -# -product version optional -otsdaq_mu2e v3_00_00 -cetmodules v3_24_01 - only_for_build -end_product_list - -# -nq- here means there is no qualifier -# a "-" here means the dependent product is not required by the parent and will not be setup -qualifier otsdaq_mu2e notes - -e28:s130:prof e28:s130:prof -std=c++20 -e28:s130:debug e28:s130:debug -std=c++20 -e26:s130:prof e26:s130:prof -std=c++17 -e26:s130:debug e26:s130:debug -std=c++17 -e20:s130:prof e20:s130:prof -std=c++17 -e20:s130:debug e20:s130:debug -std=c++17 -c14:s130:prof c14:s130:prof -std=c++17 -c14:s130:debug c14:s130:debug -std=c++17 - -e28:s128:prof e28:s128:prof -std=c++20 -e28:s128:debug e28:s128:debug -std=c++20 -e26:s128:prof e26:s128:prof -std=c++17 -e26:s128:debug e26:s128:debug -std=c++17 -e20:s128:prof e20:s128:prof -std=c++17 -e20:s128:debug e20:s128:debug -std=c++17 -c14:s128:prof c14:s128:prof -std=c++17 -c14:s128:debug c14:s128:debug -std=c++17 -end_qualifier_list - -# Preserve tabs and formatting in emacs and vi / vim: - -### Local Variables: -### tab-width: 8 -### End: - -# vi:set ts=8 noexpandtab: diff --git a/ups/setup_deps b/ups/setup_deps deleted file mode 100644 index 0311b41..0000000 --- a/ups/setup_deps +++ /dev/null @@ -1,239 +0,0 @@ -######################################################################## -# This script is shell-agnostic, which involves much acrobatics to avoid -# causing errors in one interpreter or another (*stares in csh*). -# -# There should be as little as possible here, with most of the heavy -# lifting done by other small scripts. -# -# When sourcing this file from a script, you may have to tell this -# source file where it is via the fw_db shell (or env) variable, i.e. -# set fw_db=/some/path; source /some/path/this_file -# or fw_db=/some/path; . /some/path/this_file -# -# Generated by cetmodules 2.26.00 at Fri Aug 27 12:10:15 CDT 2021 -######################################################################## - -######################################################################## -# NO USER-SERVICEABLE PARTS BELOW. -######################################################################## - -# Determine shell flavor. -true && test $?shell = 1 && set _cetpkg_shell_flavor=csh || _cetpkg_shell_flavor=sh - -#################################### -# A common set of commands to use to hide as many shell flavor -# differences as possible. - -################## -# IMPORTANT NOTE: -# -# Following extensive tests in multiple shells, I have reached the -# conclusion that it is not actually possible for a function to mirror -# the semantics of an assignment with respect to the status code of `` -# and compound statements joined with "||" or "&&". To handle this, we -# write a large chunk of shell code to a temporary file in the current -# directory a.k.a. CETPKG_BUILD with shell variable assignments correct -# according to the shell flavor, and then source it. This also allows us -# to deal with the fact that some shells don't pass arguments to sourced -# scripts *stares harder in csh*. -# -# 2020-06-24 CHG. -################## - -# If we're C-flavored, set up the commands using alias. -test "$_cetpkg_shell_flavor" = csh && \ - set _cetpkg_nobuild="nobuild" && \ - set _cetpkg_shell_var_set=set\\1 && \ - alias vecho_ 'if ($?vv == 1) echo \>\> \!*' && \ - alias unsetenv_ unsetenv && \ - alias tnotnull "eval '"'test $?'"\!* -eq 1' && eval '"'test -n "$'"\!*"'"'"'" && \ - alias nullout "\!* >& /dev/null" && \ - alias __TOP_EOF__ '' && \ - alias return exit - -# For Bourne-flavored shells, use functions. -test "$_cetpkg_shell_flavor" = sh && \ - _cetpkg_nobuild="nobuild" && \ - _cetpkg_shell_var_set= && \ - eval 'vecho_() { test -n "${vv-}" && echo ">> $*"; return 0; }' && \ - eval 'setenv() { eval "$1=\"\${2-}\"; export $1"; }' && \ - eval 'unsetenv_() { unset "$@"; }' && \ - eval 'source() { . "$@"; }' && \ - eval 'tnotnull() { eval "test -n \"\${$1-}\""; }' && \ - eval 'nullout() { "$@" >/dev/null 2>&1; }' -#################################### - -################## -# Check for UPS (uses alias for return in C-flavored shells). -test -z "$UPS_DIR" && \ - ( echo ""; echo "ERROR: you MUST set up UPS"; echo "" ) && \ - return 1 || true -################## - -#################################### -# Need to find ourselves to set CETPKG_SOURCE. - -# Define empty variables for C-flavor shells to make things easier. -test "$_cetpkg_shell_flavor" = csh && \ - set _cetpkg_fw_db= _cetpkg_myself= _cetpkg_mydir= - -# If user has set fw_db, identify our top-level source directory now. -test "$_cetpkg_shell_flavor" = csh && tnotnull fw_db && \ - set _cetpkg_fw_db=`sh -c "cd $fw_db:q >/dev/null 2>&1 && /bin/pwd -P"` && \ - vecho_ "found ourselves through fw_db" || true -test "$_cetpkg_shell_flavor" = sh && tnotnull fw_db && \ - _cetpkg_fw_db=`sh -c "cd \"$fw_db\" >/dev/null 2>&1 && /bin/pwd -P"` && \ - vecho_ "found ourselves through fw_db" || true - -################## -# For Bash and zsh, identify ourselves now so we don't have to go -# through acrobatics later in the sourced script. -test "$_cetpkg_shell_flavor" = sh && tnotnull BASH_SOURCE && \ - _cetpkg_myself="$BASH_SOURCE" && test -n "$BASH_SOURCE" && \ - vecho_ "found ourselves through BASH_SOURCE" || true -test "$_cetpkg_shell_flavor" = sh -a -z "$_cetpkg_myself" && \ - tnotnull ZSH_VERSION && eval '_cetpkg_myself="${(%):-%x}"' && \ - test -n "$_cetpkg_myself" && \ - vecho_ "found ourselves through ZSH prompt logic" || true -test "$_cetpkg_shell_flavor" = sh && tnotnull _cetpkg_myself && \ - _cetpkg_mydir=`dirname "$_cetpkg_myself"` && \ - _cetpkg_fw_db=`sh -c "cd $_cetpkg_mydir >/dev/null 2>&1 && /bin/pwd -P"` || true -################## - -################## -# History is applicable only for interactive t/csh. -test -z "$_cetpkg_fw_db" -a "$_cetpkg_shell_flavor" = csh -a $?history = 0 && \ - set history=5 || true -test -z "$_cetpkg_fw_db" -a "$_cetpkg_shell_flavor" = csh && \ - set _cetpkg_mydir=`history 1|sed -Ee 's/^[[:space:][:digit:]:]*.*\bsource[[:space:]]+//'` && \ - test -n "$_cetpkg_mydir" && set _cetpkg_mydir=`dirname $_cetpkg_mydir[1]:q` && \ - set _cetpkg_fw_db=`sh -c "cd $_cetpkg_mydir:q >/dev/null 2>&1 && /bin/pwd -P"` && \ - vecho_ 'setting db via interactive history' || true -################## - -# Set CETPKG_SOURCE. -test -n "$_cetpkg_fw_db" && \ - vecho_ "_cetpkg_fw_db=$_cetpkg_fw_db" && \ - setenv CETPKG_SOURCE `dirname $_cetpkg_fw_db` || \ - printf "WARNING: please set shell or env. variable fw_db (to be the path to the\n\ - framework source code). Fix this and other errors may go away.\n" -#################################### - -################## -# Set CETPKG_BUILD. -setenv CETPKG_BUILD `/bin/pwd -P` -################## - -######################################################################## -# Write the rest of ourselves to a file and source it to handle status -# code semantics for variable assignments. -# -# Note that even here we have to play a trick or two due to the fact -# that we have to deal with the difference in the way sh- and csh-flavor -# shells handle a quoted delimiter word for a HERE document: the latter -# expect the delimiter to include the quoting; the former do not. This -# is the reason for the C-flavored __TOP_EOF__ alias, and the explicit -# return at the end of the sourced script. -# -######################################################################## - -sed -Ee 's&\b__SET__([[:space:]]+)&'$_cetpkg_shell_var_set'&g' \ - -e 's&__SETUP_ARGS__&'"$*"'&g' \ - > ./setup_common.$_cetpkg_shell_flavor <<\__TOP_EOF__ -######################################################################## - -#################################### -# Personality check: are we setup_deps or setup_for_development? -# -# If we're sourcing setup.in directly (e.g. for cetmodules itself) then -# we select "setup_for_development" behavior, otherwise _cetpkg_nobuild -# will be set appropriately by CMake's CONFIGURE() command for -# setup_for_development or setup_deps. - -test -z "$_cetpkg_nobuild" -o "$_cetpkg_nobuild" = "--nobuild" || \ - __SET__ _cetpkg_nobuild="" || true -#################################### - -#################################### -# Initial info. - -printf "\n"; -test -z "$_cetpkg_nobuild" && \ - echo "The working build directory is $CETPKG_BUILD" || true -cat <= 2.00.00" || true -test -n "$_cetpkg_status" -o -z "$_cetpkg_cetmsetup" || setup -B $_cetpkg_cetmsetup -test $? != 0 && __SET__ _cetpkg_status=1 && \ - echo "ERROR: setup of $_cetpkg_cetmsetup has failed" || true -test -z "$_cetpkg_status$_cetpkg_cetmsetup" && setenv PATH `dropit -sfe "$CETPKG_SOURCE/bin"` && __SET__ _cetpkg_cettop="$CETPKG_SOURCE" || true -test -z "$_cetpkg_status$_cetpkg_cettop" -a -n "$CETMODULES_DIR" && __SET__ _cetpkg_cettop="$CETMODULES_DIR" -#################################### - -#################################### -# Generate the setup script to set up dependencies. - -test -n "$_cetpkg_status" || \ - __SET__ _cetpkg_setup="`${_cetpkg_cettop}/libexec/set_dev_products $_cetpkg_nobuild __SETUP_ARGS__`" -test $? != 0 -o -z "$_cetpkg_setup" && __SET__ _cetpkg_status=1 && \ - echo "ERROR: generation of setup script has failed" || true -#################################### - -#################################### -# Source the setup script to set up dependencies. - -test -n "$_cetpkg_status" || source "$_cetpkg_setup" -test $? != 0 && __SET__ _cetpkg_status=1 && \ - echo "ERROR: setup of required products has failed" || true -__SET__ _cetpkg_setup_errlog="$CETPKG_BUILD/cetpkg_setup.err" -test -s "$_cetpkg_setup_errlog" && cat "$_cetpkg_setup_errlog" || \ - rm -f "$_cetpkg_setup_errlog" -#################################### - -cat <\> \!*' && \ - alias unsetenv_ unsetenv && \ - alias tnotnull "eval '"'test $?'"\!* -eq 1' && eval '"'test -n "$'"\!*"'"'"'" && \ - alias nullout "\!* >& /dev/null" && \ - alias __TOP_EOF__ '' && \ - alias return exit - -# For Bourne-flavored shells, use functions. -test "$_cetpkg_shell_flavor" = sh && \ - _cetpkg_nobuild="" && \ - _cetpkg_shell_var_set= && \ - eval 'vecho_() { test -n "${vv-}" && echo ">> $*"; return 0; }' && \ - eval 'setenv() { eval "$1=\"\${2-}\"; export $1"; }' && \ - eval 'unsetenv_() { unset "$@"; }' && \ - eval 'source() { . "$@"; }' && \ - eval 'tnotnull() { eval "test -n \"\${$1-}\""; }' && \ - eval 'nullout() { "$@" >/dev/null 2>&1; }' -#################################### - -################## -# Check for UPS (uses alias for return in C-flavored shells). -test -z "$UPS_DIR" && \ - ( echo ""; echo "ERROR: you MUST set up UPS"; echo "" ) && \ - return 1 || true -################## - -#################################### -# Need to find ourselves to set CETPKG_SOURCE. - -# Define empty variables for C-flavor shells to make things easier. -test "$_cetpkg_shell_flavor" = csh && \ - set _cetpkg_fw_db= _cetpkg_myself= _cetpkg_mydir= - -# If user has set fw_db, identify our top-level source directory now. -test "$_cetpkg_shell_flavor" = csh && tnotnull fw_db && \ - set _cetpkg_fw_db=`sh -c "cd $fw_db:q >/dev/null 2>&1 && /bin/pwd -P"` && \ - vecho_ "found ourselves through fw_db" || true -test "$_cetpkg_shell_flavor" = sh && tnotnull fw_db && \ - _cetpkg_fw_db=`sh -c "cd \"$fw_db\" >/dev/null 2>&1 && /bin/pwd -P"` && \ - vecho_ "found ourselves through fw_db" || true - -################## -# For Bash and zsh, identify ourselves now so we don't have to go -# through acrobatics later in the sourced script. -test "$_cetpkg_shell_flavor" = sh && tnotnull BASH_SOURCE && \ - _cetpkg_myself="$BASH_SOURCE" && test -n "$BASH_SOURCE" && \ - vecho_ "found ourselves through BASH_SOURCE" || true -test "$_cetpkg_shell_flavor" = sh -a -z "$_cetpkg_myself" && \ - tnotnull ZSH_VERSION && eval '_cetpkg_myself="${(%):-%x}"' && \ - test -n "$_cetpkg_myself" && \ - vecho_ "found ourselves through ZSH prompt logic" || true -test "$_cetpkg_shell_flavor" = sh && tnotnull _cetpkg_myself && \ - _cetpkg_mydir=`dirname "$_cetpkg_myself"` && \ - _cetpkg_fw_db=`sh -c "cd $_cetpkg_mydir >/dev/null 2>&1 && /bin/pwd -P"` || true -################## - -################## -# History is applicable only for interactive t/csh. -test -z "$_cetpkg_fw_db" -a "$_cetpkg_shell_flavor" = csh -a $?history = 0 && \ - set history=5 || true -test -z "$_cetpkg_fw_db" -a "$_cetpkg_shell_flavor" = csh && \ - set _cetpkg_mydir=`history 1|sed -Ee 's/^[[:space:][:digit:]:]*.*\bsource[[:space:]]+//'` && \ - test -n "$_cetpkg_mydir" && set _cetpkg_mydir=`dirname $_cetpkg_mydir[1]:q` && \ - set _cetpkg_fw_db=`sh -c "cd $_cetpkg_mydir:q >/dev/null 2>&1 && /bin/pwd -P"` && \ - vecho_ 'setting db via interactive history' || true -################## - -# Set CETPKG_SOURCE. -test -n "$_cetpkg_fw_db" && \ - vecho_ "_cetpkg_fw_db=$_cetpkg_fw_db" && \ - setenv CETPKG_SOURCE `dirname $_cetpkg_fw_db` || \ - printf "WARNING: please set shell or env. variable fw_db (to be the path to the\n\ - framework source code). Fix this and other errors may go away.\n" -#################################### - -################## -# Set CETPKG_BUILD. -setenv CETPKG_BUILD `/bin/pwd -P` -################## - -######################################################################## -# Write the rest of ourselves to a file and source it to handle status -# code semantics for variable assignments. -# -# Note that even here we have to play a trick or two due to the fact -# that we have to deal with the difference in the way sh- and csh-flavor -# shells handle a quoted delimiter word for a HERE document: the latter -# expect the delimiter to include the quoting; the former do not. This -# is the reason for the C-flavored __TOP_EOF__ alias, and the explicit -# return at the end of the sourced script. -# -######################################################################## - -sed -Ee 's&\b__SET__([[:space:]]+)&'$_cetpkg_shell_var_set'&g' \ - -e 's&__SETUP_ARGS__&'"$*"'&g' \ - > ./setup_common.$_cetpkg_shell_flavor <<\__TOP_EOF__ -######################################################################## - -#################################### -# Personality check: are we setup_deps or setup_for_development? -# -# If we're sourcing setup.in directly (e.g. for cetmodules itself) then -# we select "setup_for_development" behavior, otherwise _cetpkg_nobuild -# will be set appropriately by CMake's CONFIGURE() command for -# setup_for_development or setup_deps. - -test -z "$_cetpkg_nobuild" -o "$_cetpkg_nobuild" = "--nobuild" || \ - __SET__ _cetpkg_nobuild="" || true -#################################### - -#################################### -# Initial info. - -printf "\n"; -test -z "$_cetpkg_nobuild" && \ - echo "The working build directory is $CETPKG_BUILD" || true -cat <= 2.00.00" || true -test -n "$_cetpkg_status" -o -z "$_cetpkg_cetmsetup" || setup -B $_cetpkg_cetmsetup -test $? != 0 && __SET__ _cetpkg_status=1 && \ - echo "ERROR: setup of $_cetpkg_cetmsetup has failed" || true -test -z "$_cetpkg_status$_cetpkg_cetmsetup" && setenv PATH `dropit -sfe "$CETPKG_SOURCE/bin"` && __SET__ _cetpkg_cettop="$CETPKG_SOURCE" || true -test -z "$_cetpkg_status$_cetpkg_cettop" -a -n "$CETMODULES_DIR" && __SET__ _cetpkg_cettop="$CETMODULES_DIR" -#################################### - -#################################### -# Generate the setup script to set up dependencies. - -test -n "$_cetpkg_status" || \ - __SET__ _cetpkg_setup="`${_cetpkg_cettop}/libexec/set_dev_products $_cetpkg_nobuild __SETUP_ARGS__`" -test $? != 0 -o -z "$_cetpkg_setup" && __SET__ _cetpkg_status=1 && \ - echo "ERROR: generation of setup script has failed" || true -#################################### - -#################################### -# Source the setup script to set up dependencies. - -test -n "$_cetpkg_status" || source "$_cetpkg_setup" -test $? != 0 && __SET__ _cetpkg_status=1 && \ - echo "ERROR: setup of required products has failed" || true -__SET__ _cetpkg_setup_errlog="$CETPKG_BUILD/cetpkg_setup.err" -test -s "$_cetpkg_setup_errlog" && cat "$_cetpkg_setup_errlog" || \ - rm -f "$_cetpkg_setup_errlog" -#################################### - -cat <