summaryrefslogtreecommitdiff
path: root/src/buildtool/execution_api/common
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2025-02-20 13:15:38 +0100
committerKlaus Aehlig <klaus.aehlig@huawei.com>2025-02-20 16:24:25 +0100
commit04765b75fd186329755695a9afba906edfcda135 (patch)
treed67671a95a478780358ee40c3b87fda38c42efb0 /src/buildtool/execution_api/common
parent413d9ee4211a78a35e753bb7d6b21211ae928fbd (diff)
downloadjustbuild-04765b75fd186329755695a9afba906edfcda135.tar.gz
Separate off id generation to a separate library
... and rename appropriately to reflect contents more precisely than the generic "common". This separation also disentangles dependencies a bit.
Diffstat (limited to 'src/buildtool/execution_api/common')
-rw-r--r--src/buildtool/execution_api/common/TARGETS23
-rw-r--r--src/buildtool/execution_api/common/ids.hpp (renamed from src/buildtool/execution_api/common/execution_common.hpp)6
2 files changed, 21 insertions, 8 deletions
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 1aff977d..f7258cb6 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -2,8 +2,7 @@
{ "type": ["@", "rules", "CC", "library"]
, "name": ["common"]
, "hdrs":
- [ "execution_common.hpp"
- , "execution_api.hpp"
+ [ "execution_api.hpp"
, "execution_action.hpp"
, "execution_response.hpp"
, "tree_reader.hpp"
@@ -22,19 +21,33 @@
, ["src/buildtool/execution_engine/dag", "dag"]
, ["src/buildtool/file_system", "git_repo"]
, ["src/buildtool/file_system", "object_type"]
- , ["src/buildtool/logging", "log_level"]
, ["src/buildtool/logging", "logging"]
, ["src/utils/cpp", "expected"]
- , ["src/utils/cpp", "gsl"]
- , ["src/utils/cpp", "hex_string"]
]
, "private-deps":
[ ["@", "json", "", "json"]
, ["src/buildtool/common", "artifact_digest_factory"]
+ , ["src/buildtool/logging", "log_level"]
+ , ["src/utils/cpp", "hex_string"]
, ["src/utils/cpp", "path"]
]
, "stage": ["src", "buildtool", "execution_api", "common"]
}
+, "ids":
+ { "type": ["@", "rules", "CC", "library"]
+ , "name": ["common"]
+ , "hdrs": ["ids.hpp"]
+ , "deps":
+ [ ["@", "fmt", "", "fmt"]
+ , ["@", "gsl", "", "gsl"]
+ , ["src/buildtool/crypto", "hash_function"]
+ , ["src/buildtool/logging", "log_level"]
+ , ["src/buildtool/logging", "logging"]
+ , ["src/utils/cpp", "gsl"]
+ , ["src/utils/cpp", "hex_string"]
+ ]
+ , "stage": ["src", "buildtool", "execution_api", "common"]
+ }
, "bytestream_utils":
{ "type": ["@", "rules", "CC", "library"]
, "name": ["bytestream_utils"]
diff --git a/src/buildtool/execution_api/common/execution_common.hpp b/src/buildtool/execution_api/common/ids.hpp
index 7a55003c..0c5f689a 100644
--- a/src/buildtool/execution_api/common/execution_common.hpp
+++ b/src/buildtool/execution_api/common/ids.hpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_EXECUTION_COMMON_HPP
-#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_EXECUTION_COMMON_HPP
+#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_IDS_HPP
+#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_IDS_HPP
#ifdef __unix__
#include <sys/types.h>
@@ -129,4 +129,4 @@ static void EncodeUUIDVariant1(std::string* uuid) {
return ss.str();
}
-#endif // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_EXECUTION_COMMON_HPP
+#endif // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_IDS_HPP