From 45e76c93482246288cda64201766d17a57b6ba80 Mon Sep 17 00:00:00 2001
From: Tim Martin <Tim.Martin@cern.ch>
Date: Fri, 28 Feb 2020 18:07:27 +0100
Subject: [PATCH] Avoid package name clash, use TrigConfHLTUtils
---
.../HLTUtils/HLTUtils/ATLAS_CHECK_THREAD_SAFETY | 1 -
.../TrigConfiguration/TrigConfHLTData/CMakeLists.txt | 4 ++--
.../TrigConfHLTData/TrigConfHLTData/HLTUtils.h | 2 +-
.../{HLTUtils => TrigConfHLTUtils}/CMakeLists.txt | 10 +++++-----
.../{HLTUtils => TrigConfHLTUtils}/README.md | 2 +-
.../{HLTUtils => TrigConfHLTUtils}/Root/HLTUtils.cxx | 2 +-
.../TrigConfHLTUtils/ATLAS_CHECK_THREAD_SAFETY | 1 +
.../TrigConfHLTUtils}/HLTUtils.h | 4 ++--
.../util/trigconf_string2hash.cxx | 2 +-
Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt | 2 +-
.../TrigCompositeUtils/Root/HLTIdentifier.cxx | 2 +-
11 files changed, 16 insertions(+), 16 deletions(-)
delete mode 100644 Trigger/TrigConfiguration/HLTUtils/HLTUtils/ATLAS_CHECK_THREAD_SAFETY
rename Trigger/TrigConfiguration/{HLTUtils => TrigConfHLTUtils}/CMakeLists.txt (59%)
rename Trigger/TrigConfiguration/{HLTUtils => TrigConfHLTUtils}/README.md (96%)
rename Trigger/TrigConfiguration/{HLTUtils => TrigConfHLTUtils}/Root/HLTUtils.cxx (99%)
create mode 100644 Trigger/TrigConfiguration/TrigConfHLTUtils/TrigConfHLTUtils/ATLAS_CHECK_THREAD_SAFETY
rename Trigger/TrigConfiguration/{HLTUtils/HLTUtils => TrigConfHLTUtils/TrigConfHLTUtils}/HLTUtils.h (94%)
rename Trigger/TrigConfiguration/{HLTUtils => TrigConfHLTUtils}/util/trigconf_string2hash.cxx (87%)
diff --git a/Trigger/TrigConfiguration/HLTUtils/HLTUtils/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigConfiguration/HLTUtils/HLTUtils/ATLAS_CHECK_THREAD_SAFETY
deleted file mode 100644
index 20c4eef653a..00000000000
--- a/Trigger/TrigConfiguration/HLTUtils/HLTUtils/ATLAS_CHECK_THREAD_SAFETY
+++ /dev/null
@@ -1 +0,0 @@
-Trigger/TrigConfiguration/HLTUtils
diff --git a/Trigger/TrigConfiguration/TrigConfHLTData/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfHLTData/CMakeLists.txt
index d8da5f472d2..8b0318b6e8d 100644
--- a/Trigger/TrigConfiguration/TrigConfHLTData/CMakeLists.txt
+++ b/Trigger/TrigConfiguration/TrigConfHLTData/CMakeLists.txt
@@ -9,7 +9,7 @@ atlas_subdir( TrigConfHLTData )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Trigger/TrigConfiguration/TrigConfL1Data
- Trigger/TrigConfiguration/HLTUtils )
+ Trigger/TrigConfiguration/TrigConfHLTUtils )
# External dependencies:
find_package( Boost COMPONENTS system thread )
@@ -19,6 +19,6 @@ atlas_add_library( TrigConfHLTData
TrigConfHLTData/*.h Root/*.cxx
PUBLIC_HEADERS TrigConfHLTData
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} TrigConfL1Data HLTUtilsLib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} TrigConfL1Data TrigConfHLTUtilsLib )
atlas_install_python_modules( python/*.py )
diff --git a/Trigger/TrigConfiguration/TrigConfHLTData/TrigConfHLTData/HLTUtils.h b/Trigger/TrigConfiguration/TrigConfHLTData/TrigConfHLTData/HLTUtils.h
index 7abdc8a637f..f7d4fb4e889 100644
--- a/Trigger/TrigConfiguration/TrigConfHLTData/TrigConfHLTData/HLTUtils.h
+++ b/Trigger/TrigConfiguration/TrigConfHLTData/TrigConfHLTData/HLTUtils.h
@@ -3,7 +3,7 @@
*/
/// Hashing functions have moved here
-#include "HLTUtils/HLTUtils.h"
+#include "TrigConfHLTUtils/HLTUtils.h"
#ifndef TrigConfHLTData_HLTUtils
#define TrigConfHLTData_HLTUtils
diff --git a/Trigger/TrigConfiguration/HLTUtils/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfHLTUtils/CMakeLists.txt
similarity index 59%
rename from Trigger/TrigConfiguration/HLTUtils/CMakeLists.txt
rename to Trigger/TrigConfiguration/TrigConfHLTUtils/CMakeLists.txt
index 31263449398..7900acb1384 100644
--- a/Trigger/TrigConfiguration/HLTUtils/CMakeLists.txt
+++ b/Trigger/TrigConfiguration/TrigConfHLTUtils/CMakeLists.txt
@@ -1,15 +1,15 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
# Declare the package name.
-atlas_subdir( HLTUtils )
+atlas_subdir( TrigConfHLTUtils )
# Add the package's stand alone library
-atlas_add_library( HLTUtilsLib
- HLTUtils/*.h Root/*.cxx
- PUBLIC_HEADERS HLTUtils
+atlas_add_library( TrigConfHLTUtilsLib
+ TrigConfHLTUtils/*.h Root/*.cxx
+ PUBLIC_HEADERS TrigConfHLTUtils
LINK_LIBRARIES CxxUtils )
# Executable(s).
atlas_add_executable( trigconf_string2hash
util/trigconf_string2hash.cxx
- LINK_LIBRARIES HLTUtilsLib )
+ LINK_LIBRARIES TrigConfHLTUtilsLib )
diff --git a/Trigger/TrigConfiguration/HLTUtils/README.md b/Trigger/TrigConfiguration/TrigConfHLTUtils/README.md
similarity index 96%
rename from Trigger/TrigConfiguration/HLTUtils/README.md
rename to Trigger/TrigConfiguration/TrigConfHLTUtils/README.md
index 1f7d3808b6a..1bf1dbbd41d 100644
--- a/Trigger/TrigConfiguration/HLTUtils/README.md
+++ b/Trigger/TrigConfiguration/TrigConfHLTUtils/README.md
@@ -1,4 +1,4 @@
-# HLTUtils
+# TrigConfHLTUtils
Package to host the `string2hash`, `hash2string`, `hashes2file` and `file2hashes` helper functions.
diff --git a/Trigger/TrigConfiguration/HLTUtils/Root/HLTUtils.cxx b/Trigger/TrigConfiguration/TrigConfHLTUtils/Root/HLTUtils.cxx
similarity index 99%
rename from Trigger/TrigConfiguration/HLTUtils/Root/HLTUtils.cxx
rename to Trigger/TrigConfiguration/TrigConfHLTUtils/Root/HLTUtils.cxx
index f55b3972a45..11c2109588c 100644
--- a/Trigger/TrigConfiguration/HLTUtils/Root/HLTUtils.cxx
+++ b/Trigger/TrigConfiguration/TrigConfHLTUtils/Root/HLTUtils.cxx
@@ -13,7 +13,7 @@
#include <vector>
#include <fstream>
-#include "HLTUtils/HLTUtils.h"
+#include "TrigConfHLTUtils/HLTUtils.h"
#include "CxxUtils/checker_macros.h"
using namespace TrigConf;
diff --git a/Trigger/TrigConfiguration/TrigConfHLTUtils/TrigConfHLTUtils/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigConfiguration/TrigConfHLTUtils/TrigConfHLTUtils/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 00000000000..838f0de3a53
--- /dev/null
+++ b/Trigger/TrigConfiguration/TrigConfHLTUtils/TrigConfHLTUtils/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigConfiguration/TrigConfHLTUtils
diff --git a/Trigger/TrigConfiguration/HLTUtils/HLTUtils/HLTUtils.h b/Trigger/TrigConfiguration/TrigConfHLTUtils/TrigConfHLTUtils/HLTUtils.h
similarity index 94%
rename from Trigger/TrigConfiguration/HLTUtils/HLTUtils/HLTUtils.h
rename to Trigger/TrigConfiguration/TrigConfHLTUtils/TrigConfHLTUtils/HLTUtils.h
index 9d0205995ea..0bff5d721aa 100644
--- a/Trigger/TrigConfiguration/HLTUtils/HLTUtils/HLTUtils.h
+++ b/Trigger/TrigConfiguration/TrigConfHLTUtils/TrigConfHLTUtils/HLTUtils.h
@@ -2,8 +2,8 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef HLTUtils_HLTUtils
-#define HLTUtils_HLTUtils
+#ifndef TrigConfHLTUtils_HLTUtils
+#define TrigConfHLTUtils_HLTUtils
#include <string>
#include <inttypes.h>
diff --git a/Trigger/TrigConfiguration/HLTUtils/util/trigconf_string2hash.cxx b/Trigger/TrigConfiguration/TrigConfHLTUtils/util/trigconf_string2hash.cxx
similarity index 87%
rename from Trigger/TrigConfiguration/HLTUtils/util/trigconf_string2hash.cxx
rename to Trigger/TrigConfiguration/TrigConfHLTUtils/util/trigconf_string2hash.cxx
index 064cb66b985..47d61f034b1 100644
--- a/Trigger/TrigConfiguration/HLTUtils/util/trigconf_string2hash.cxx
+++ b/Trigger/TrigConfiguration/TrigConfHLTUtils/util/trigconf_string2hash.cxx
@@ -3,7 +3,7 @@
*/
#include <iostream>
-#include "HLTUtils/HLTUtils.h"
+#include "TrigConfHLTUtils/HLTUtils.h"
int main (int argc, char *argv []) {
if (argc > 1) {
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt b/Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt
index a7cd4aafa2b..e1fc6e80028 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt
+++ b/Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt
@@ -16,7 +16,7 @@ endif()
atlas_add_library( TrigCompositeUtilsLib
TrigCompositeUtils/*.h TrigCompositeUtils/*.icc Root/*.cxx ${extra_srcs}
PUBLIC_HEADERS TrigCompositeUtils
- LINK_LIBRARIES HLTUtilsLib CxxUtils AsgMessagingLib ${extra_libs} )
+ LINK_LIBRARIES TrigConfHLTUtilsLib CxxUtils AsgMessagingLib ${extra_libs} )
# Install files from the package.
atlas_install_python_modules( python/*.py )
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/Root/HLTIdentifier.cxx b/Trigger/TrigSteer/TrigCompositeUtils/Root/HLTIdentifier.cxx
index 12bcac92753..012b501896d 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/Root/HLTIdentifier.cxx
+++ b/Trigger/TrigSteer/TrigCompositeUtils/Root/HLTIdentifier.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "HLTUtils/HLTUtils.h"
+#include "TrigConfHLTUtils/HLTUtils.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
using namespace HLT;
--
GitLab