From d6069277b5185f2de25008f13b39d4f4cf245066 Mon Sep 17 00:00:00 2001 From: "David B. Kinder" Date: Tue, 24 May 2022 15:06:27 -0700 Subject: [PATCH] move buildtype above debugoptions in the scenario schema DX/UI recommendation is to move the build type parameter outside of the debugoptions section. This breaks existing schema files, so also update scenario XML files in the code tree to match. Update the xforms xsl script with the same change to the buildtype option location in schema XML files. Tracked-On: #5692 Signed-off-by: David B. Kinder --- .../cfl-k700-i7/hybrid_launch_2user_vm.xml | 2 +- .../data/cfl-k700-i7/hybrid_rt.xml | 2 +- .../data/cfl-k700-i7/partitioned.xml | 2 +- .../cfl-k700-i7/shared_launch_6user_vm.xml | 2 +- .../generic_board/hybrid_launch_2user_vm.xml | 2 +- .../data/generic_board/hybrid_rt.xml | 2 +- .../data/generic_board/partitioned.xml | 2 +- .../generic_board/shared_launch_6user_vm.xml | 2 +- .../nuc11tnbi5/hybrid_launch_2user_vm.xml | 2 +- .../data/nuc11tnbi5/partitioned.xml | 2 +- .../nuc11tnbi5/shared_launch_6user_vm.xml | 2 +- misc/config_tools/data/qemu/shared.xml | 2 +- .../data/tgl-vecow-spc-7100-Corei7/hybrid.xml | 2 +- .../tgl-vecow-spc-7100-Corei7/partitioned.xml | 2 +- .../shared_launch_2user_vm.xml | 2 +- misc/config_tools/data/whl-ipc-i5/hybrid.xml | 2 +- .../hybrid_rt_launch_1user_vm_waag.xml | 2 +- .../data/whl-ipc-i5/partitioned.xml | 2 +- .../shared_launch_1user_vm_hardrt.xml | 2 +- .../shared_launch_1user_vm_vxworks.xml | 2 +- .../shared_launch_1user_vm_waag.xml | 2 +- .../whl-ipc-i5/shared_launch_2user_vm.xml | 2 +- .../whl-ipc-i5/shared_launch_6user_vm.xml | 2 +- misc/config_tools/schema/config.xsd | 20 +++++++++---------- misc/config_tools/xforms/config_common.xsl | 11 +++++----- 25 files changed, 39 insertions(+), 38 deletions(-) diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml index 74b2d18c4..dd3486e18 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml index 237096d68..b74917f59 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml index 8d3267aea..db626afd2 100644 --- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml +++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml index 06e7d289b..a48c976ba 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml index 5cf91dc2f..c793b1edc 100644 --- a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index 92b3894a3..b8a869eb2 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml index 1763d67d5..1d155eac3 100644 --- a/misc/config_tools/data/generic_board/partitioned.xml +++ b/misc/config_tools/data/generic_board/partitioned.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml index cd801e7c1..206dd0d75 100644 --- a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml index 5cf91dc2f..c793b1edc 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml index 316a52fd3..c94b8ac3c 100644 --- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml +++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml index 99357438f..50240a3a2 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml index a82907c00..18e617ac0 100644 --- a/misc/config_tools/data/qemu/shared.xml +++ b/misc/config_tools/data/qemu/shared.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml index 8abf9f39e..9097106d0 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml index 276d6e6d1..53908fc69 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml index 6c4179987..27bc5d524 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index c6c6065e7..cd83afb34 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml index 8ce835471..8a7896ce8 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml index d8d847876..5241e2a43 100644 --- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml +++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml index 06369be68..4ea1d1781 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml index cec4d65f3..7b1e9ee13 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml index 66321a8c7..62843d8da 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml index a6ddcca9d..fbfe17478 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml index e2bc7421a..b330427fb 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml @@ -1,7 +1,7 @@ + debug - debug /dev/ttyS0 5 5 diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index a65460c49..802f0eae2 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -13,16 +13,6 @@ - - - Select the build type: - -* ``Debug`` enables the debug shell, prints, and logs. -* ``Release`` optimizes the ACRN binary for deployment and turns off all debug infrastructure. - -These settings can only be changed at build time. - - @@ -255,6 +245,16 @@ These settings can only be changed at build time. + + + Select the build type: + +* ``Debug`` enables the debug shell, prints, and logs. +* ``Release`` optimizes the ACRN binary for deployment and turns off all debug infrastructure. + +These settings can only be changed at build time. + + diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl index 3c951ced3..70afd248e 100644 --- a/misc/config_tools/xforms/config_common.xsl +++ b/misc/config_tools/xforms/config_common.xsl @@ -1,6 +1,6 @@ - + + + + + + @@ -43,10 +48,6 @@ - - - -