From ca002acf40ac5a575ebc787dcc5845c601934e21 Mon Sep 17 00:00:00 2001 From: grasci <86058054+grasci-arm@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:05:59 +0100 Subject: [PATCH] [projmgr] Add `apis` section --- test/packs/ARM/RteTest/0.1.0/API/index.html | 1 + test/packs/ARM/RteTest/0.1.0/ARM.RteTest.pdsc | 1 + tools/projmgr/include/ProjMgrWorker.h | 2 + tools/projmgr/include/ProjMgrYamlParser.h | 4 ++ tools/projmgr/schemas/common.schema.json | 26 +++++++++ tools/projmgr/src/ProjMgrUtils.cpp | 14 ++--- tools/projmgr/src/ProjMgrWorker.cpp | 23 +++++--- tools/projmgr/src/ProjMgrYamlEmitter.cpp | 57 +++++++++++++------ ...pack-access-sequences+CM4-Board.cbuild.yml | 9 +++ .../project.Debug+TEST_TARGET.cbuild.yml | 9 +++ .../project.Release+TEST_TARGET.cbuild.yml | 9 +++ .../multiple-components.Debug+CM0.cbuild.yml | 9 +++ .../ref/test-gpdsc-layer.Debug+CM0.cbuild.yml | 9 +++ ...c-multiple-generators.Debug+CM0.cbuild.yml | 9 +++ ...t-gpdsc-project-files.Debug+CM0.cbuild.yml | 9 +++ .../ref/test-gpdsc.Debug+CM0.cbuild.yml | 9 +++ ...components.Debug+RteTest_ARMCM3.cbuild.yml | 14 ++++- ...ch-protection.Debug+bti-signret.cbuild.yml | 11 +++- .../branch-protection.Debug+bti.cbuild.yml | 11 +++- .../branch-protection.Debug+no-bp.cbuild.yml | 11 +++- .../ref/dsp.Debug+dsp.cbuild.yml | 11 +++- .../ref/dsp.Debug+no-dsp.cbuild.yml | 11 +++- .../ref/endian.Debug+big.cbuild.yml | 11 +++- .../ref/endian.Debug+little.cbuild.yml | 11 +++- .../ref/fpu.Debug+fpu-dp.cbuild.yml | 11 +++- .../ref/fpu.Debug+fpu-sp.cbuild.yml | 11 +++- .../ref/fpu.Debug+no-fpu.cbuild.yml | 11 +++- .../ref/mve.Debug+mve-fp.cbuild.yml | 11 +++- .../ref/mve.Debug+mve-int.cbuild.yml | 11 +++- .../ref/mve.Debug+no-mve.cbuild.yml | 11 +++- .../ref/trustzone.Debug+non-secure.cbuild.yml | 11 +++- .../trustzone.Debug+secure-only.cbuild.yml | 11 +++- .../ref/trustzone.Debug+secure.cbuild.yml | 11 +++- .../trustzone.Debug+tz-disabled.cbuild.yml | 11 +++- .../ref/trustzone.Fail+secure.cbuild.yml | 11 +++- .../linker.AutoGen+RteTest_ARMCM3.cbuild.yml | 2 +- .../linker.AutoGen+RteTest_Board.cbuild.yml | 2 +- ...er.FromComponent+RteTest_ARMCM3.cbuild.yml | 2 +- ....PriorityDefines+RteTest_ARMCM3.cbuild.yml | 11 +++- ....PriorityRegions+RteTest_ARMCM3.cbuild.yml | 11 +++- .../metadata.Debug+RteTest_ARMCM3.cbuild.yml | 11 +++- .../library.Debug+RteTest_ARMCM3.cbuild.yml | 11 +++- ...mplate_api.Debug+RteTest_ARMCM3.cbuild.yml | 14 ++++- .../ref/project.Debug+CM0.cbuild.yml | 11 +++- ...st_board_and_device+TEST_TARGET.cbuild.yml | 11 +++- .../TestProject3_1.Debug+TypeA.cbuild-gen.yml | 11 +++- .../ref/cbuild/test1.Debug+CM0.cbuild.yml | 11 +++- .../ref/cbuild/test1.Release+CM0.cbuild.yml | 11 +++- .../ref/cbuild/test2.Debug+CM0.cbuild.yml | 11 +++- .../ref/cbuild/test2.Debug+CM3.cbuild.yml | 11 +++- .../ref/outputFiles.Debug+Target.cbuild.yml | 11 +++- .../ref/outputFiles.Library+Target.cbuild.yml | 11 +++- .../ref/pre-include+CM0.cbuild.yml | 11 +++- .../ref/rtedir.Debug+CM0.cbuild.yml | 2 +- .../ref/rtedir.Release+CM0.cbuild.yml | 2 +- .../test/src/ProjMgrUtilsUnitTests.cpp | 5 +- 56 files changed, 521 insertions(+), 74 deletions(-) create mode 100644 test/packs/ARM/RteTest/0.1.0/API/index.html diff --git a/test/packs/ARM/RteTest/0.1.0/API/index.html b/test/packs/ARM/RteTest/0.1.0/API/index.html new file mode 100644 index 000000000..2186e1117 --- /dev/null +++ b/test/packs/ARM/RteTest/0.1.0/API/index.html @@ -0,0 +1 @@ +// index.html diff --git a/test/packs/ARM/RteTest/0.1.0/ARM.RteTest.pdsc b/test/packs/ARM/RteTest/0.1.0/ARM.RteTest.pdsc index 4895f3e70..2584e5730 100644 --- a/test/packs/ARM/RteTest/0.1.0/ARM.RteTest.pdsc +++ b/test/packs/ARM/RteTest/0.1.0/ARM.RteTest.pdsc @@ -118,6 +118,7 @@ RteTest Test API 2.0.0 + diff --git a/tools/projmgr/include/ProjMgrWorker.h b/tools/projmgr/include/ProjMgrWorker.h index 3628b5fe4..9e7f78253 100644 --- a/tools/projmgr/include/ProjMgrWorker.h +++ b/tools/projmgr/include/ProjMgrWorker.h @@ -302,12 +302,14 @@ struct ContextItem { std::map targetAttributes; std::map packages; std::map components; + std::map> apis; std::map bootstrapComponents; StrMap bootstrapMap; std::vector, std::set>> validationResults; std::map> configFiles; std::map plmStatus; std::map> componentFiles; + std::map> apiFiles; std::map> generatorInputFiles; std::vector groups; std::map generators; diff --git a/tools/projmgr/include/ProjMgrYamlParser.h b/tools/projmgr/include/ProjMgrYamlParser.h index a5e97fd35..96bcba0b6 100644 --- a/tools/projmgr/include/ProjMgrYamlParser.h +++ b/tools/projmgr/include/ProjMgrYamlParser.h @@ -13,6 +13,8 @@ /** * @brief YAML key definitions */ +static constexpr const char* YAML_APIS = "apis"; +static constexpr const char* YAML_API = "api"; static constexpr const char* YAML_ADDPATH = "add-path"; static constexpr const char* YAML_ADDPATH_ASM = "add-path-asm"; static constexpr const char* YAML_ALWAYS = "always"; @@ -95,6 +97,8 @@ static constexpr const char* YAML_GROUP = "group"; static constexpr const char* YAML_GROUPS = "groups"; static constexpr const char* YAML_HOST = "host"; static constexpr const char* YAML_ID = "id"; +static constexpr const char* YAML_IMPLEMENTED_BY = "implemented-by"; +static constexpr const char* YAML_IMPLEMENTS = "implements"; static constexpr const char* YAML_INFO = "info"; static constexpr const char* YAML_INPUT = "input"; static constexpr const char* YAML_INSTANCES = "instances"; diff --git a/tools/projmgr/schemas/common.schema.json b/tools/projmgr/schemas/common.schema.json index 4975be23a..4b0894afa 100644 --- a/tools/projmgr/schemas/common.schema.json +++ b/tools/projmgr/schemas/common.schema.json @@ -1068,6 +1068,7 @@ "output-dirs": { "$ref": "#/definitions/BuildOutputDirectoriesType" }, "output": { "$ref": "#/definitions/OutputFilesType" }, "components": { "$ref": "#/definitions/ResolvedComponentsType" }, + "apis": { "$ref": "#/definitions/ResolvedApisType" }, "linker": { "$ref": "#/definitions/LinkerType" }, "groups": { "$ref": "#/definitions/BuildGroupsType" }, "generators": { "$ref": "#/definitions/GeneratorsType" }, @@ -1273,6 +1274,7 @@ "component": { "$ref": "#/definitions/ComponentID" }, "condition": { "$ref": "#/definitions/ConditionIDType" }, "selected-by": { "$ref": "#/definitions/ComponentID" }, + "implements": { "$ref": "#/definitions/ComponentID" }, "rtedir": { "type": "string" }, "optimize": { "$ref": "#/definitions/OptimizeType" }, "debug": { "$ref": "#/definitions/DebugType" }, @@ -1293,6 +1295,30 @@ }, "additionalProperties": false }, + "ResolvedApisType": { + "type": "array", + "description": "List of API in their resolved state", + "uniqueItems": true, + "items": { "$ref": "#/definitions/ResolvedApiType" } + }, + "ResolvedApiType": { + "type": "object", + "description": "API in its resolved state", + "properties": { + "api": { "$ref": "#/definitions/ComponentID" }, + "condition": { "$ref": "#/definitions/ConditionIDType" }, + "implemented-by": { "$ref": "#/definitions/ImplementedByType" }, + "files": { "$ref": "#/definitions/FilesType" }, + "from-pack": { "$ref": "#/definitions/PackID" } + }, + "additionalProperties": false + }, + "ImplementedByType": { + "oneOf": [ + { "type": "array", "items": { "$ref": "#/definitions/ComponentID" } }, + { "$ref": "#/definitions/ComponentID" } + ] + }, "SetupsType": { "type": "array", "description": "List of setup nodes that collects various toolchain options", diff --git a/tools/projmgr/src/ProjMgrUtils.cpp b/tools/projmgr/src/ProjMgrUtils.cpp index c7a1f491b..edd76819b 100644 --- a/tools/projmgr/src/ProjMgrUtils.cpp +++ b/tools/projmgr/src/ProjMgrUtils.cpp @@ -387,26 +387,26 @@ bool ProjMgrUtils::HasAccessSequence(const string value) { } const string ProjMgrUtils::FormatPath(const string& original, const string& directory, bool useAbsolutePaths) { - string packRoot = ProjMgrKernel::Get()->GetCmsisPackRoot(); + if (original.find("http") == 0) { + return original; + } string path = original; RteFsUtils::NormalizePath(path); - path = RteFsUtils::MakePathCanonical(path); if (!useAbsolutePaths) { + string packRoot = ProjMgrKernel::Get()->GetCmsisPackRoot(); size_t index = path.find(packRoot); if (index != string::npos) { path.replace(index, packRoot.length(), "${CMSIS_PACK_ROOT}"); - } - else { + } else { string compilerRoot; ProjMgrUtils::GetCompilerRoot(compilerRoot); index = path.find(compilerRoot); if (!compilerRoot.empty() && index != string::npos) { path.replace(index, compilerRoot.length(), "${CMSIS_COMPILER_ROOT}"); - } - else { + } else { error_code ec; const string relative = fs::relative(path, directory, ec).generic_string(); - if (!relative.empty()) { + if (!relative.empty() && path == fs::path(directory).append(relative).lexically_normal().generic_string()) { path = relative; } } diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp index 6d1010d11..2dbb5e5e8 100644 --- a/tools/projmgr/src/ProjMgrWorker.cpp +++ b/tools/projmgr/src/ProjMgrWorker.cpp @@ -2191,12 +2191,20 @@ bool ProjMgrWorker::ProcessComponentFiles(ContextItem& context) { // component based API files const auto& api = rteComponent->GetApi(context.rteActiveTarget, true); if (api) { - const auto& apiFiles = api->GetFileContainer() ? api->GetFileContainer()->GetChildren() : Collection(); - for (const auto& apiFile : apiFiles) { - const auto& name = api->GetPackage()->GetAbsolutePackagePath() + apiFile->GetAttribute("name"); - const auto& category = apiFile->GetAttribute("category"); - if (category == "header") { - context.componentFiles[componentId].push_back({ name, "", "api" }); + context.apis[api].push_back(componentId); + if (context.apis[api].size() == 1) { + const auto& apiId = api->ConstructComponentID(true); + const auto& apiFiles = api->GetFileContainer() ? api->GetFileContainer()->GetChildren() : Collection(); + for (const auto& apiFile : apiFiles) { + const auto& attr = apiFile->GetAttribute("attr"); + const auto& category = apiFile->GetAttribute("category"); + const auto& name = category == "doc" ? apiFile->GetDocFile() : + api->GetPackage()->GetAbsolutePackagePath() + apiFile->GetAttribute("name"); + const auto& scope = apiFile->GetAttribute("scope"); + const auto& language = apiFile->GetAttribute("language"); + const auto& select = apiFile->GetAttribute("select"); + const auto& version = apiFile->GetVersionString(); + context.apiFiles[apiId].push_back({ name, attr, category, language, scope, version, select }); } } } @@ -2212,8 +2220,9 @@ bool ProjMgrWorker::ProcessComponentFiles(ContextItem& context) { if (attr == "config") { continue; } - const auto& name = rteComponent->GetPackage()->GetAbsolutePackagePath() + componentFile->GetAttribute("name"); const auto& category = componentFile->GetAttribute("category"); + const auto& name = category == "doc" ? componentFile->GetDocFile() : + rteComponent->GetPackage()->GetAbsolutePackagePath() + componentFile->GetAttribute("name"); const auto& scope = componentFile->GetAttribute("scope"); const auto& language = componentFile->GetAttribute("language"); const auto& select = componentFile->GetAttribute("select"); diff --git a/tools/projmgr/src/ProjMgrYamlEmitter.cpp b/tools/projmgr/src/ProjMgrYamlEmitter.cpp index 01bac1727..7c9417a5c 100644 --- a/tools/projmgr/src/ProjMgrYamlEmitter.cpp +++ b/tools/projmgr/src/ProjMgrYamlEmitter.cpp @@ -53,8 +53,9 @@ class ProjMgrYamlCbuild : public ProjMgrYamlBase { void SetContextNode(YAML::Node node, const ContextItem* context, const string& generatorId, const string& generatorPack); void SetComponentsNode(YAML::Node node, const ContextItem* context); void SetComponentFilesNode(YAML::Node node, const ContextItem* context, const string& componentId); + void SetApisNode(YAML::Node node, const ContextItem* context); void SetGeneratorsNode(YAML::Node node, const ContextItem* context); - void SetGeneratorFiles(YAML::Node node, const ContextItem* context, const string& componentId); + void SetFiles(YAML::Node node, const std::vector& files, const std::string& dir); void SetConstructedFilesNode(YAML::Node node, const ContextItem* context); void SetOutputDirsNode(YAML::Node node, const ContextItem* context); void SetOutputNode(YAML::Node node, const ContextItem* context); @@ -485,6 +486,7 @@ void ProjMgrYamlCbuild::SetContextNode(YAML::Node contextNode, const ContextItem SetOutputDirsNode(contextNode[YAML_OUTPUTDIRS], context); SetOutputNode(contextNode[YAML_OUTPUT], context); SetComponentsNode(contextNode[YAML_COMPONENTS], context); + SetApisNode(contextNode[YAML_APIS], context); SetGeneratorsNode(contextNode[YAML_GENERATORS], context); SetLinkerNode(contextNode[YAML_LINKER], context); SetGroupsNode(contextNode[YAML_GROUPS], context, context->groups); @@ -504,6 +506,10 @@ void ProjMgrYamlCbuild::SetComponentsNode(YAML::Node node, const ContextItem* co SetNodeValue(componentNode[YAML_CONDITION], rteComponent->GetConditionID()); SetNodeValue(componentNode[YAML_FROM_PACK], rteComponent->GetPackageID()); SetNodeValue(componentNode[YAML_SELECTED_BY], componentItem->component); + const auto& api = rteComponent->GetApi(context->rteActiveTarget, true); + if (api) { + SetNodeValue(componentNode[YAML_IMPLEMENTS], api->ConstructComponentID(true)); + } const string& rteDir = rteComponent->GetAttribute("rtedir"); if (!rteDir.empty()) { SetNodeValue(componentNode[YAML_OUTPUT_RTEDIR], FormatPath(context->cproject->directory + "/" + rteDir, context->directories.cbuild)); @@ -515,7 +521,9 @@ void ProjMgrYamlCbuild::SetComponentsNode(YAML::Node node, const ContextItem* co const RteGenerator* rteGenerator = get_or_null(context->generators, component.generator); if(rteGenerator && !rteGenerator->IsExternal()) { SetNodeValue(componentNode[YAML_GENERATOR][YAML_FROM_PACK], rteGenerator->GetPackageID()); - SetGeneratorFiles(componentNode[YAML_GENERATOR], context, componentId); + if (context->generatorInputFiles.find(componentId) != context->generatorInputFiles.end()) { + SetFiles(componentNode[YAML_GENERATOR], context->generatorInputFiles.at(componentId), context->directories.cbuild); + } } else if (contains_key(context->extGen, component.generator)) { SetNodeValue(componentNode[YAML_GENERATOR][YAML_PATH], FormatPath(fs::path(context->extGen.at(component.generator).name).generic_string(), @@ -583,22 +591,39 @@ void ProjMgrYamlCbuild::SetComponentFilesNode(YAML::Node node, const ContextItem } } -void ProjMgrYamlCbuild::SetGeneratorFiles(YAML::Node node, const ContextItem* context, const string& componentId) { - if (context->generatorInputFiles.find(componentId) != context->generatorInputFiles.end()) { - YAML::Node filesNode; - for (const auto& [file, attr, category, language, scope, version, select] : context->generatorInputFiles.at(componentId)) { - YAML::Node fileNode; - SetNodeValue(fileNode[YAML_FILE], FormatPath(file, context->directories.cbuild)); - SetNodeValue(fileNode[YAML_CATEGORY], category); - SetNodeValue(fileNode[YAML_ATTR], attr); - SetNodeValue(fileNode[YAML_LANGUAGE], language); - SetNodeValue(fileNode[YAML_SCOPE], scope); - SetNodeValue(fileNode[YAML_VERSION], version); - SetNodeValue(fileNode[YAML_SELECT], select); - filesNode.push_back(fileNode); +void ProjMgrYamlCbuild::SetApisNode(YAML::Node node, const ContextItem* context) { + for (const auto& [api, componentIds] : context->apis) { + YAML::Node apiNode; + const auto& apiId = api->ConstructComponentID(true); + SetNodeValue(apiNode[YAML_API], apiId); + SetNodeValue(apiNode[YAML_CONDITION], api->GetConditionID()); + SetNodeValue(apiNode[YAML_FROM_PACK], api->GetPackageID()); + if (componentIds.size() == 1) { + SetNodeValue(apiNode[YAML_IMPLEMENTED_BY], componentIds.front()); + } else { + SetNodeValue(apiNode[YAML_IMPLEMENTED_BY], componentIds); + } + if (context->apiFiles.find(apiId) != context->apiFiles.end()) { + SetFiles(apiNode, context->apiFiles.at(apiId), context->directories.cbuild); } - node[YAML_FILES] = filesNode; + node.push_back(apiNode); + } +} + +void ProjMgrYamlCbuild::SetFiles(YAML::Node node, const std::vector& files, const std::string& dir) { + YAML::Node filesNode; + for (const auto& [file, attr, category, language, scope, version, select] : files) { + YAML::Node fileNode; + SetNodeValue(fileNode[YAML_FILE], FormatPath(file, dir)); + SetNodeValue(fileNode[YAML_CATEGORY], category); + SetNodeValue(fileNode[YAML_ATTR], attr); + SetNodeValue(fileNode[YAML_LANGUAGE], language); + SetNodeValue(fileNode[YAML_SCOPE], scope); + SetNodeValue(fileNode[YAML_VERSION], version); + SetNodeValue(fileNode[YAML_SELECT], select); + filesNode.push_back(fileNode); } + node[YAML_FILES] = filesNode; } void ProjMgrYamlCbuild::SetGeneratorsNode(YAML::Node node, const ContextItem* context) { diff --git a/tools/projmgr/test/data/TestAccessSequences/ref/pack-access-sequences+CM4-Board.cbuild.yml b/tools/projmgr/test/data/TestAccessSequences/ref/pack-access-sequences+CM4-Board.cbuild.yml index 743d53b90..cabbb7cd1 100644 --- a/tools/projmgr/test/data/TestAccessSequences/ref/pack-access-sequences+CM4-Board.cbuild.yml +++ b/tools/projmgr/test/data/TestAccessSequences/ref/pack-access-sequences+CM4-Board.cbuild.yml @@ -45,10 +45,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.1.1 selected-by: CORE + implements: RteTest:CORE@1.1.1 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.1.1/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.1 + from-pack: ARM::RteTest_DFP@0.1.1 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.1 linker: script: ../data/TestAccessSequences/RTE/Device/RteTest_ARMCM4_FP/ac6_linker_script.sct.src regions: ../data/TestAccessSequences/RTE/Device/RteTest_ARMCM4_FP/regions_RteTest_CM4_board.h diff --git a/tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml b/tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml index 01e591f4b..26a4fa35c 100644 --- a/tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml +++ b/tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml @@ -39,10 +39,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.1.1 selected-by: CORE + implements: RteTest:CORE@1.1.1 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.1.1/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.1 + from-pack: ARM::RteTest_DFP@0.1.1 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.1 linker: script: ../../data/TestDefault/RTE/Device/RteTest_ARMCM0/gcc_linker_script.ld.src regions: ../../data/TestDefault/RTE/Device/RteTest_ARMCM0/regions_RteTest_ARMCM0.h diff --git a/tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml b/tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml index 5cd9f388d..e341bc15c 100644 --- a/tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml +++ b/tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml @@ -39,10 +39,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.1.1 selected-by: CORE + implements: RteTest:CORE@1.1.1 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.1.1/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.1 + from-pack: ARM::RteTest_DFP@0.1.1 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.1 linker: script: ../../data/TestDefault/RTE/Device/RteTest_ARMCM0/gcc_linker_script.ld.src regions: ../../data/TestDefault/RTE/Device/RteTest_ARMCM0/regions_RteTest_ARMCM0.h diff --git a/tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml index c75eb175e..607bc1106 100644 --- a/tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml @@ -55,10 +55,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: RteTest:CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 generators: - generator: RteTestGeneratorIdentifier from-pack: ARM::RteTestGenerator@0.1.0 diff --git a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml index 89eb5fe37..0e7d46a26 100644 --- a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml @@ -44,10 +44,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: RteTest:CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 generators: - generator: RteTestGeneratorIdentifier from-pack: ARM::RteTestGenerator@0.1.0 diff --git a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml index 49928f131..c17edb420 100644 --- a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml @@ -55,10 +55,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: RteTest:CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 generators: - generator: RteTestGeneratorIdentifier from-pack: ARM::RteTestGenerator@0.1.0 diff --git a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml index ddea39c9e..f3f294f01 100644 --- a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml @@ -42,10 +42,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: RteTest:CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 generators: - generator: RteTestGeneratorIdentifier from-pack: ARM::RteTestGenerator@0.1.0 diff --git a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml index 3a9774db9..2ac1e893f 100644 --- a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml @@ -44,10 +44,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: RteTest:CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 generators: - generator: RteTestGeneratorIdentifier from-pack: ARM::RteTestGenerator@0.1.0 diff --git a/tools/projmgr/test/data/TestSolution/ComponentSources/ref/components.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/ComponentSources/ref/components.Debug+RteTest_ARMCM3.cbuild.yml index 2643a5b2e..810cfdfec 100644 --- a/tools/projmgr/test/data/TestSolution/ComponentSources/ref/components.Debug+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ComponentSources/ref/components.Debug+RteTest_ARMCM3.cbuild.yml @@ -51,9 +51,8 @@ build: - component: ARM::RteTest:TemplateFile@0.9.9 from-pack: ARM::RteTest@0.1.0 selected-by: RteTest:TemplateFile + implements: RteTest:TemplateFile@1.0.0 files: - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/API/IConfig.h - category: api - file: ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/Include/Config/ConfigInclude.h category: header version: 0.9.9 @@ -63,6 +62,17 @@ build: attr: template version: 0.9.9 select: dummy template file + apis: + - api: RteTest:TemplateFile@1.0.0 + from-pack: ARM::RteTest@0.1.0 + implemented-by: ARM::RteTest:TemplateFile@0.9.9 + files: + - file: ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/API/IConfig.h + category: header + version: 1.0.0 + - file: ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/API/index.html + category: doc + version: 1.0.0 linker: script: ../data/TestSolution/ComponentSources/RTE/Device/RteTest_ARMCM3/ac6_linker_script.sct.src regions: ../data/TestSolution/ComponentSources/RTE/Device/RteTest_ARMCM3/regions_RteTest_ARMCM3.h diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml index a963c1038..3fb8a529c 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/branch-protection/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/branch-protection/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml index 75440a62c..8108fb8c5 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/branch-protection/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/branch-protection/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml index a04f6cbb7..312af7608 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/branch-protection/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/branch-protection/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml index 7f349d321..6f2babeed 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/dsp/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/dsp/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml index 818699c71..54e6c4e62 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/dsp/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/dsp/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml index f7b0a3240..19954c895 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/endian/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/endian/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml index d5b0288db..426dbe70a 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/endian/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/endian/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml index 4f88d2f20..b63f7a4bb 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml @@ -40,7 +40,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/fpu/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -59,10 +59,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/fpu/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml index 5dd82bf82..65a187cba 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml @@ -40,7 +40,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/fpu/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -59,10 +59,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/fpu/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml index a8e3d352c..abc10151a 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml @@ -40,7 +40,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/fpu/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -59,10 +59,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/fpu/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml index 235d7d064..f329c689d 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/mve/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/mve/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml index 458b90b43..8e79f79b6 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/mve/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/mve/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml index 2b67e77ce..2f3ff893b 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/mve/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/mve/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml index 4c8ca95cc..77fcb8d03 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/trustzone/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/trustzone/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure-only.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure-only.cbuild.yml index 94eac79fd..d2eb201ba 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure-only.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure-only.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/trustzone/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/trustzone/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml index aac704863..3e131427f 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml @@ -43,7 +43,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/trustzone/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -62,10 +62,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/trustzone/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml index ca859f69a..efabb0cc2 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml @@ -41,7 +41,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/trustzone/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -60,10 +60,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/trustzone/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml index bda9b6c89..b9366e2e8 100644 --- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml @@ -43,7 +43,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/DeviceAttributes/trustzone/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -62,10 +62,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/DeviceAttributes/trustzone/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_ARMCM3.cbuild.yml index 4c618d09e..2088b2f84 100644 --- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_ARMCM3.cbuild.yml @@ -50,7 +50,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM3/Include/ARMCM3.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/LinkerOptions/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_Board.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_Board.cbuild.yml index ecb411820..84e03814e 100644 --- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_Board.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_Board.cbuild.yml @@ -52,7 +52,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM3/Include/ARMCM3.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/LinkerOptions/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.FromComponent+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.FromComponent+RteTest_ARMCM3.cbuild.yml index 292ee84e1..610eeb659 100644 --- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.FromComponent+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.FromComponent+RteTest_ARMCM3.cbuild.yml @@ -50,7 +50,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM3/Include/ARMCM3.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/LinkerOptions/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml index cb81bd276..32d695835 100644 --- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml @@ -50,7 +50,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM3/Include/ARMCM3.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/LinkerOptions/layer/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct @@ -69,10 +69,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: RteTest:CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/LinkerOptions/layer/RTE/Device/RteTest_ARMCM3/ac6_linker_script.sct.src regions: ../data/TestSolution/LinkerOptions/layer/RTE/Device/RteTest_ARMCM3/regions_RteTest_ARMCM3.h diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml index 607838b2a..50a0b0502 100644 --- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml @@ -50,7 +50,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM3/Include/ARMCM3.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/LinkerOptions/layer/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct @@ -69,10 +69,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: RteTest:CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/LinkerOptions/layer/RTE/Device/RteTest_ARMCM3/ac6_linker_script.sct.src regions: ../data/TestSolution/LinkerOptions/layer/RTE/Device/RteTest_ARMCM3/regions_RteTest_ARMCM3.h diff --git a/tools/projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml index 8162da8a8..4294deb23 100644 --- a/tools/projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml @@ -40,7 +40,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.1.1/Device/ARM/ARMCM3/Include/ARMCM3.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.1.1/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/PackMetadata/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct @@ -59,10 +59,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.1.1 selected-by: CORE + implements: RteTest:CORE@1.1.1 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.1.1/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.1 + from-pack: ARM::RteTest_DFP@0.1.1 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.1 linker: script: ../data/TestSolution/PackMetadata/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml index 38f1a7248..8fa0535d9 100644 --- a/tools/projmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml @@ -48,7 +48,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM3/Include/ARMCM3.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/StandardLibrary/RTE/Device/RteTest_ARMCM3/gcc_arm.ld @@ -67,10 +67,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 constructed-files: - file: ../data/TestSolution/StandardLibrary/RTE/_Debug_RteTest_ARMCM3/RTE_Components.h category: header diff --git a/tools/projmgr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml index 6436c3c09..a7c7439ed 100644 --- a/tools/projmgr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml @@ -41,9 +41,8 @@ build: - component: ARM::RteTest:TemplateFile@0.9.9 from-pack: ARM::RteTest@0.1.0 selected-by: RteTest:TemplateFile + implements: RteTest:TemplateFile@1.0.0 files: - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/API/IConfig.h - category: api - file: ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/Dummy/dummy.c category: sourceC version: 0.9.9 @@ -56,6 +55,17 @@ build: attr: template version: 0.9.9 select: dummy template file + apis: + - api: RteTest:TemplateFile@1.0.0 + from-pack: ARM::RteTest@0.1.0 + implemented-by: ARM::RteTest:TemplateFile@0.9.9 + files: + - file: ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/API/IConfig.h + category: header + version: 1.0.0 + - file: ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/API/index.html + category: doc + version: 1.0.0 linker: script: ../data/TestSolution/TemplateAndApi/RTE/Device/RteTest_ARMCM3/ac6_linker_script.sct.src regions: ../data/TestSolution/TemplateAndApi/RTE/Device/RteTest_ARMCM3/regions_RteTest_ARMCM3.h diff --git a/tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml index 3c4a5c7fb..df8424003 100644 --- a/tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml @@ -40,7 +40,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/TestBaseUpdate/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -62,10 +62,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: RteTest:CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/TestBaseUpdate/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct groups: diff --git a/tools/projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml b/tools/projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml index 66eb17309..761642b25 100644 --- a/tools/projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml @@ -43,7 +43,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/TestProject4/RTE/Device/RteTest_ARMCM0_Dual_cm0_core1/ARMCM0_ac6.sct @@ -62,10 +62,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/TestProject4/RTE/Device/RteTest_ARMCM0_Dual_cm0_core1/ARMCM0_ac6.sct groups: diff --git a/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml b/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml index 2be10ef6e..9c3e523a6 100644 --- a/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml +++ b/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml @@ -75,7 +75,7 @@ build-gen: - file: ${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ${DEVTOOLS(data)}/TestSolution/TestProject3_1/RTE/Device/RteTestGen_ARMCM0/gcc_arm.ld @@ -94,10 +94,19 @@ build-gen: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 generators: - generator: RteTestGeneratorIdentifier from-pack: ARM::RteTestGenerator@0.1.0 diff --git a/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml index 6a847815c..ca86bdcc6 100644 --- a/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml @@ -73,7 +73,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/TestProject1/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -92,6 +92,7 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 define: - DEF1-COMPONENT define-asm: @@ -108,6 +109,14 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/TestProject1/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct groups: diff --git a/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml index 84f995916..12f3ffe11 100644 --- a/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml @@ -56,7 +56,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/TestProject1/RTE/Device/RteTest_ARMCM0/gcc_arm.ld @@ -75,6 +75,7 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 define: - DEF1-COMPONENT define-asm: @@ -91,6 +92,14 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/TestProject1/RTE/Device/RteTest_ARMCM0/gcc_arm.ld groups: diff --git a/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml index 3f8fa7dbb..c9754ca82 100644 --- a/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml @@ -80,7 +80,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/TestProject2/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -99,10 +99,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: RteTest:CORE@0.1.1 + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/TestProject2/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct groups: diff --git a/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml index 97102b62f..1d1c0f7df 100644 --- a/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml @@ -77,7 +77,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM3/Include/ARMCM3.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/TestProject2/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct @@ -96,10 +96,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: RteTest:CORE@0.1.1 + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/TestProject2/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct groups: diff --git a/tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml index d8e087c21..e1c01e4dd 100644 --- a/tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml @@ -44,7 +44,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM3/Include/ARMCM3.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct @@ -63,10 +63,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml index e574a5ea1..4df8c02c8 100644 --- a/tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml @@ -40,7 +40,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM3/Include/ARMCM3.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct @@ -59,10 +59,19 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc version: 0.1.1 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 constructed-files: - file: ../data/TestSolution/RTE/_Library_Target/RTE_Components.h category: header diff --git a/tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml index 433c1db26..a25dd99b5 100644 --- a/tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml @@ -50,7 +50,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct @@ -69,6 +69,7 @@ build: condition: Cortex-M Device from-pack: ARM::RteTest_DFP@0.2.0 selected-by: CORE + implements: RteTest:CORE@1.1.2 files: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/html/index.html category: doc @@ -120,6 +121,14 @@ build: category: preIncludeGlobal attr: config version: 0.0.2 + apis: + - api: RteTest:CORE@1.1.2 + from-pack: ARM::RteTest_DFP@0.2.0 + implemented-by: ARM::RteTest:CORE@0.1.1 + files: + - file: https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_apis_pg.html + category: doc + version: 1.1.2 linker: script: ../data/TestSolution/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct constructed-files: diff --git a/tools/projmgr/test/data/TestSolution/ref/rtedir.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/rtedir.Debug+CM0.cbuild.yml index 6989dc8cb..f6db0a94e 100644 --- a/tools/projmgr/test/data/TestSolution/ref/rtedir.Debug+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/rtedir.Debug+CM0.cbuild.yml @@ -40,7 +40,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/AC6/Device/RteTest_ARMCM0/ARMCM0_ac6.sct diff --git a/tools/projmgr/test/data/TestSolution/ref/rtedir.Release+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/rtedir.Release+CM0.cbuild.yml index c0e10114d..9b71d31c5 100644 --- a/tools/projmgr/test/data/TestSolution/ref/rtedir.Release+CM0.cbuild.yml +++ b/tools/projmgr/test/data/TestSolution/ref/rtedir.Release+CM0.cbuild.yml @@ -40,7 +40,7 @@ build: - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include/ARMCM0.h category: header version: 2.0.3 - - file: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/https:/arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html + - file: https://arm-software.github.io/CMSIS_5/Core_A/html/startup_c_pg.html category: doc version: 2.0.3 - file: ../data/TestSolution/GCC/Device/RteTest_ARMCM0/gcc_arm.ld diff --git a/tools/projmgr/test/src/ProjMgrUtilsUnitTests.cpp b/tools/projmgr/test/src/ProjMgrUtilsUnitTests.cpp index 5ebf386dc..074a33e11 100644 --- a/tools/projmgr/test/src/ProjMgrUtilsUnitTests.cpp +++ b/tools/projmgr/test/src/ProjMgrUtilsUnitTests.cpp @@ -496,12 +496,11 @@ TEST_F(ProjMgrUtilsUnitTests, FormatPath) { { "OriginalPath" , testoutput_folder + "/OriginalPath" }, { "${CMSIS_PACK_ROOT}/Pack" , testcmsispack_folder + "/Pack" }, { "${CMSIS_COMPILER_ROOT}/Toolchain" , testcmsiscompiler_folder + "/Toolchain" }, + { "C:/Temp/Absolute" , "C:/Temp/Absolute" }, + { "https://www.url.com" , "https://www.url.com" }, }; for (const auto& [expected, original] : testData) { EXPECT_EQ(expected, ProjMgrUtils::FormatPath(original, testoutput_folder)) << "failed for original path \"" << original << "\""; } - if (CrossPlatformUtils::GetHostType() != "mac") { - EXPECT_EQ("C:/tmp", ProjMgrUtils::FormatPath("C:/tmp", testoutput_folder)); - } }