Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Eflumerf/de mr bify #152

Merged
merged 2 commits into from
Apr 1, 2024
Merged

Eflumerf/de mr bify #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42d0130
Start pruning references to MRB_SOURCE, as it doesn't exist in Spackl…
eflumerf Apr 1, 2024
ef26e33
Define OTS_SOURCE when SPACK_ENV is set
eflumerf Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions otsdaq/CodeEditor/CodeEditor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const std::string CodeEditor::SPECIAL_TYPE_Tools = "Tools";
const std::string CodeEditor::SPECIAL_TYPE_UserData = "UserData";
const std::string CodeEditor::SPECIAL_TYPE_OutputData = "OutputData";

const std::string CodeEditor::SOURCE_BASE_PATH = std::string(__ENV__("MRB_SOURCE")) + "/";
const std::string CodeEditor::SOURCE_BASE_PATH = std::string(__ENV__("OTS_SOURCE")) + "/";
const std::string CodeEditor::USER_DATA_PATH = std::string(__ENV__("USER_DATA")) + "/";
const std::string CodeEditor::OTSDAQ_DATA_PATH = std::string(__ENV__("OTSDAQ_DATA")) + "/";

Expand Down Expand Up @@ -679,7 +679,7 @@ void CodeEditor::build(cgicc::Cgicc& cgiIn, HttpXmlDocument* /*xmlOut*/, const s
std::map<std::string /*special type*/, std::set<std::string> /*special file paths*/> CodeEditor::getSpecialsMap(void)
{
std::map<std::string /*special type*/, std::set<std::string> /*special file paths*/> retMap;
std::string path = std::string(__ENV__("MRB_SOURCE"));
std::string path = std::string(__ENV__("OTS_SOURCE"));

__COUTV__(path);

Expand Down
11 changes: 11 additions & 0 deletions tools/ots
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,20 +536,31 @@ if [ "x$MRB_BUILDDIR" != "x" ] && [ -e $OTSDAQ_DEMO_DIR/CMakeLists.txt ]; then
export OTSDAQDEMO_BUILD=${MRB_BUILDDIR}/otsdaq_demo
export OTSDAQ_DEMO_LIB=`echo ${MRB_BUILDDIR}/otsdaq_demo/slf7*/lib`
export OTSDAQDEMO_REPO=$OTSDAQ_DEMO_DIR
export OTS_SOURCE=$MRB_SOURCE
unset OTSDAQ_DEMO_DIR
fi

if [ "x$MRB_BUILDDIR" != "x" ] && [ -e $OTSDAQ_DIR/CMakeLists.txt ]; then
export OTSDAQ_BUILD=${MRB_BUILDDIR}/otsdaq
export OTSDAQ_LIB=`echo ${MRB_BUILDDIR}/otsdaq/slf7*/lib`
export OTSDAQ_REPO=$OTSDAQ_DIR
export OTS_SOURCE=$MRB_SOURCE
export FHICL_FILE_PATH=.:$OTSDAQ_REPO/tools/fcl:$FHICL_FILE_PATH
fi

if [ "x$MRB_BUILDDIR" != "x" ] && [ -e $OTSDAQ_UTILITIES_DIR/CMakeLists.txt ]; then
export OTSDAQUTILITIES_BUILD=${MRB_BUILDDIR}/otsdaq_utilities
export OTSDAQ_UTILITIES_LIB=`echo ${MRB_BUILDDIR}/otsdaq_utilities/slf7*/lib`
export OTSDAQUTILITIES_REPO=$OTSDAQ_UTILITIES_DIR
export OTS_SOURCE=$MRB_SOURCE
fi

if [ "x$SPACK_ENV" != x ];then
export OTS_SOURCE=$SPACK_ENV
fi

if [ "x$OTS_SOURCE" == "x" ]; then
export OTS_SOURCE=$PWD
fi

if [ "x$OTSDAQ_DEMO_DIR" == "x" ]; then
Expand Down
2 changes: 1 addition & 1 deletion tools/otsdaq_convert_config_to_table
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ echo
# Convert each .cc and .h to _table.cc
# Search and replace class names in the .h .cc

REPO_DIR="$(find $MRB_SOURCE/* -maxdepth 1 -iname 'otsdaq*')"
REPO_DIR="$(find $OTS_SOURCE/* -maxdepth 1 -iname 'otsdaq*')"


for p in ${REPO_DIR[@]}; do
Expand Down