Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,8 @@ if(DEFINED LD_REGIONS AND NOT LD_REGIONS STREQUAL "")
endif()
set(CPP_ARGS_LD_SCRIPT "${CPP_FLAGS} ${CPP_DEFINES} ${CPP_INCLUDES} \"${LD_SCRIPT}\" -o \"${LD_SCRIPT_PP}\"")
separate_arguments(CPP_ARGS_LD_SCRIPT NATIVE_COMMAND ${CPP_ARGS_LD_SCRIPT})
set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - > \"${COMPILE_MACROS}\"")
separate_arguments(CPP_DUMP_MACROS NATIVE_COMMAND ${CPP_DUMP_MACROS})

# C Compiler

Expand Down
2 changes: 2 additions & 0 deletions tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,8 @@ if(DEFINED LD_REGIONS AND NOT LD_REGIONS STREQUAL "")
endif()
set(CPP_ARGS_LD_SCRIPT "${CPP_FLAGS} ${CPP_DEFINES} ${CPP_INCLUDES} \"${LD_SCRIPT}\" -o \"${LD_SCRIPT_PP}\"")
separate_arguments(CPP_ARGS_LD_SCRIPT NATIVE_COMMAND ${CPP_ARGS_LD_SCRIPT})
set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - > \"${COMPILE_MACROS}\"")
separate_arguments(CPP_DUMP_MACROS NATIVE_COMMAND ${CPP_DUMP_MACROS})

# C Compiler

Expand Down
2 changes: 2 additions & 0 deletions tools/buildmgr/cbuildgen/config/CLANG_TI.4.0.1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ if(DEFINED LD_REGIONS AND NOT LD_REGIONS STREQUAL "")
endif()
set(CPP_ARGS_LD_SCRIPT "${CPP_FLAGS} ${CPP_DEFINES} ${CPP_INCLUDES} \"${LD_SCRIPT}\" -o \"${LD_SCRIPT_PP}\"")
separate_arguments(CPP_ARGS_LD_SCRIPT NATIVE_COMMAND ${CPP_ARGS_LD_SCRIPT})
set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - > \"${COMPILE_MACROS}\"")
separate_arguments(CPP_DUMP_MACROS NATIVE_COMMAND ${CPP_DUMP_MACROS})

# C Compiler

Expand Down
2 changes: 2 additions & 0 deletions tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ if(DEFINED LD_REGIONS AND NOT LD_REGIONS STREQUAL "")
endif()
set(CPP_ARGS_LD_SCRIPT "${CPP_FLAGS} ${CPP_DEFINES} ${CPP_INCLUDES} \"${LD_SCRIPT}\" -o \"${LD_SCRIPT_PP}\"")
separate_arguments(CPP_ARGS_LD_SCRIPT NATIVE_COMMAND ${CPP_ARGS_LD_SCRIPT})
set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - > \"${COMPILE_MACROS}\"")
separate_arguments(CPP_DUMP_MACROS NATIVE_COMMAND ${CPP_DUMP_MACROS})

# C Compiler

Expand Down
2 changes: 2 additions & 0 deletions tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,8 @@ if(DEFINED LD_REGIONS AND NOT LD_REGIONS STREQUAL "")
endif()
set(CPP_ARGS_LD_SCRIPT "${CPP_FLAGS} ${CPP_DEFINES} \"${LD_SCRIPT}\" ${CPP_INCLUDES} --preprocess=ns \"${LD_SCRIPT_PP}\"")
separate_arguments(CPP_ARGS_LD_SCRIPT NATIVE_COMMAND ${CPP_ARGS_LD_SCRIPT})
set(CPP_DUMP_MACROS "${CPP_FLAGS} - --predef_macros \"${COMPILE_MACROS}\"")
separate_arguments(CPP_DUMP_MACROS NATIVE_COMMAND ${CPP_DUMP_MACROS})

# C Compiler

Expand Down
2 changes: 2 additions & 0 deletions tools/buildmgr/cbuildgen/config/XC.5.0.0.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ if(DEFINED LD_REGIONS AND NOT LD_REGIONS STREQUAL "")
endif()
set(CPP_ARGS_LD_SCRIPT "${CPP_FLAGS} ${CPP_DEFINES} ${CPP_INCLUDES} \"${LD_SCRIPT}\" -o \"${LD_SCRIPT_PP}\"")
separate_arguments(CPP_ARGS_LD_SCRIPT NATIVE_COMMAND ${CPP_ARGS_LD_SCRIPT})
set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - > \"${COMPILE_MACROS}\"")
separate_arguments(CPP_DUMP_MACROS NATIVE_COMMAND ${CPP_DUMP_MACROS})

# C Compiler

Expand Down
12 changes: 7 additions & 5 deletions tools/projmgr/src/ProjMgrCbuild.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -432,11 +432,13 @@ void ProjMgrCbuild::SetOutputNode(YAML::Node node, const ContextItem* context) {
}
}
if (!context->imageOnly) {
// add reference to compilation database
YAML::Node compdb;
SetNodeValue(compdb[YAML_TYPE], "comp-db");
SetNodeValue(compdb[YAML_FILE], "compile_commands.json");
node.push_back(compdb);
// add references to compilation database
for (const auto& file : { "compile_commands.json", "compile_macros.h" }) {
YAML::Node compdb;
SetNodeValue(compdb[YAML_TYPE], "comp-db");
SetNodeValue(compdb[YAML_FILE], file);
node.push_back(compdb);
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ build-gen:
file: core0.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTestGenerator:Check Global Generator@0.9.0
from-pack: ARM::RteTestGenerator@0.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ build-gen:
file: core1.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTestGenerator:Check Global Generator@0.9.0
from-pack: ARM::RteTestGenerator@0.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ build:
file: single-core.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTest:GlobalLevel@0.0.2
from-pack: ARM::RteTest@0.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ build-gen:
file: single-core.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTestGenerator:Check Global Generator@0.9.0
from-pack: ARM::RteTestGenerator@0.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ build:
file: single-core.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTest:GlobalLevel@0.0.2
from-pack: ARM::RteTest@0.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ build-gen:
file: ns.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTestGenerator:Check Global Generator@0.9.0
from-pack: ARM::RteTestGenerator@0.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ build-gen:
file: s_CMSE_Lib.o
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTestGenerator:Check Global Generator@0.9.0
from-pack: ARM::RteTestGenerator@0.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ build:
file: pack-access-sequences.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTest:CORE@0.1.1
condition: Cortex-M Device
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ build:
file: project.elf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTest:CORE@0.1.1
condition: Cortex-M Device
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ build:
file: project.elf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTest:CORE@0.1.1
condition: Cortex-M Device
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ build:
file: multiple-components.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device&RteTestBundle:RteTest Generated Component@1.1.0
condition: RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ build:
file: test-gpdsc-layer.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:RteTest Generated Component:RteTest@1.1.0
condition: RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ build:
file: test-gpdsc-multiple-generators.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:RteTest Generated Component:RteTest@1.1.0
condition: RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ build:
file: test-gpdsc-project-files.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:RteTest Generated Component:RteTest@1.1.0
condition: RteDevice
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ build:
file: test-gpdsc.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:RteTest Generated Component:RteTest@1.1.0
condition: RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ build:
file: setup-test.elf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTest:CORE@0.1.1
condition: Cortex-M Device
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ build:
file: setup-test.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTest:CORE@0.1.1
condition: Cortex-M Device
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ build:
file: setup-test.elf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTest:CORE@0.1.1
condition: Cortex-M Device
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ build:
file: run-debug.hex
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:Startup&RteTest Startup@2.0.3
condition: ARMCM4 RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ build:
file: run-debug.hex
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:Startup&RteTest Startup@2.0.3
condition: ARMCM3 RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ build:
file: components.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTest:DupFilename@0.9.9
from-pack: ARM::RteTest@0.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ build:
file: versions.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::RteTest:TestVersion@1.8-dev1
from-pack: ARM::RteTest@0.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ build:
file: project1.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
linker:
script: ../data/TestSolution/ContextMap/RTE/Device/RteTest_ARMCM3/ac6_linker_script.sct.src
regions: ../data/TestSolution/ContextMap/RTE/Device/RteTest_ARMCM3/regions_RteTest_ARMCM3.h
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ build:
file: project1.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
linker:
script: ../data/TestSolution/ContextMap/RTE/Device/RteTest_ARMCM3/ac6_linker_script.sct.src
regions: ../data/TestSolution/ContextMap/RTE/Device/RteTest_ARMCM3/regions_RteTest_ARMCM3.h
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ build:
file: project2.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
linker:
script: ../data/TestSolution/ContextMap/RTE/Device/RteTest_ARMCM3/ac6_linker_script.sct.src
regions: ../data/TestSolution/ContextMap/RTE/Device/RteTest_ARMCM3/regions_RteTest_ARMCM3.h
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ build:
file: project2.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
linker:
script: ../data/TestSolution/ContextMap/RTE/Device/RteTest_ARMCM3/ac6_linker_script.sct.src
regions: ../data/TestSolution/ContextMap/RTE/Device/RteTest_ARMCM3/regions_RteTest_ARMCM3.h
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build:
file: branch-protection.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:Startup&RteTest Startup@2.0.3
condition: ARMCM0 RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build:
file: branch-protection.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:Startup&RteTest Startup@2.0.3
condition: ARMCM0 RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build:
file: branch-protection.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:Startup&RteTest Startup@2.0.3
condition: ARMCM0 RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build:
file: dsp.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:Startup&RteTest Startup@2.0.3
condition: ARMCM0 RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build:
file: dsp.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:Startup&RteTest Startup@2.0.3
condition: ARMCM0 RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build:
file: endian.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:Startup&RteTest Startup@2.0.3
condition: ARMCM0 RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build:
file: endian.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:Startup&RteTest Startup@2.0.3
condition: ARMCM0 RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ build:
file: fpu.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:Startup&RteTest Startup@2.0.3
condition: ARMCM0 RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ build:
file: fpu.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:Startup&RteTest Startup@2.0.3
condition: ARMCM0 RteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ build:
file: fpu.axf
- type: comp-db
file: compile_commands.json
- type: comp-db
file: compile_macros.h
components:
- component: ARM::Device:Startup&RteTest Startup@2.0.3
condition: ARMCM0 RteTest
Expand Down
Loading
Loading