From cac6065649a5e94f746a79be29efdb367dfa2449 Mon Sep 17 00:00:00 2001 From: dwickelhaus Date: Mon, 16 Oct 2023 14:38:50 -0400 Subject: [PATCH 1/3] Updated condition shdr format for the addition of condition_id to the native_code field --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2ec819bc..2b720d3a 100755 --- a/README.md +++ b/README.md @@ -996,9 +996,11 @@ If the value itself contains a pipe character `|` the pipe must be escaped using 2009-06-15T00:00:00.000000|description|"Text with \| (pipe) character." -Conditions require seven (7) fields as follows: +Conditions require six (6) fields as follows: - ||||||| + |||||| + for adapters providing conditionIds - the conditionId is added to the native_code field with a ':' delimiter. + ||||||> For a complete description of these fields, see the standard. An example line will look like this: From bf04910a4b14ed4c1d708c012f841a90e6bf8436 Mon Sep 17 00:00:00 2001 From: dwickelhaus Date: Tue, 17 Oct 2023 11:25:42 -0400 Subject: [PATCH 2/3] Corrected SHDR pattern conditions and the condtion_id parameter Corrected path to conan profiles for the Linux and MAC builds, the Windows paths were correct. --- README.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2b720d3a..c49ae2c7 100755 --- a/README.md +++ b/README.md @@ -999,8 +999,17 @@ If the value itself contains a pipe character `|` the pipe must be escaped using Conditions require six (6) fields as follows: |||||| - for adapters providing conditionIds - the conditionId is added to the native_code field with a ':' delimiter. - ||||||> + + * Condition id and native code are set to the same value given as + + |||:||| + + * Condition id is set to condition_id and native code is set to native_code + + |||||| + + * Condition id is set to condition_id and native code is not set + For a complete description of these fields, see the standard. An example line will look like this: From 9a8e22a92531ad1fdd086e766ace08c4203efa11 Mon Sep 17 00:00:00 2001 From: dwickelhaus Date: Tue, 17 Oct 2023 11:34:40 -0400 Subject: [PATCH 3/3] Removed * from the comments under the adapter condition shdr examples. --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c49ae2c7..11a7838d 100755 --- a/README.md +++ b/README.md @@ -1000,15 +1000,15 @@ Conditions require six (6) fields as follows: |||||| - * Condition id and native code are set to the same value given as + Condition id and native code are set to the same value given as |||:||| - * Condition id is set to condition_id and native code is set to native_code + Condition id is set to condition_id and native code is set to native_code |||||| - * Condition id is set to condition_id and native code is not set + Condition id is set to condition_id and native code is not set For a complete description of these fields, see the standard. An example line will look like this: @@ -1482,7 +1482,7 @@ to instruct conan to not parallelize the builds. Some of the modules that includ ### Build the agent - conan create cppagent -pr cppagent/conan/profile/gcc --build=missing + conan create cppagent -pr cppagent/conan/profiles/gcc --build=missing ## Building on Mac OS @@ -1503,11 +1503,11 @@ Install brew and xcode command line tools ### Build the agent - conan create cppagent -pr cppagent/conan/profile/macos --build=missing + conan create cppagent -pr cppagent/conan/profiles/macos --build=missing ### Generate an xcode project for debugging - conan build . -pr conan/profile/xcode -s build_type=Debug --build=missing -o development=True + conan build . -pr conan/profiles/xcode -s build_type=Debug --build=missing -o development=True ## Building on Fedora Alpine @@ -1527,7 +1527,7 @@ Install brew and xcode command line tools ### Build the agent - conan create cppagent -pr cppagent/conan/profile/gcc --build=missing + conan create cppagent -pr cppagent/conan/profiles/gcc --build=missing ## For some examples, see the CI/CD workflows in `.github/workflows/build.yml`