From 27601281ff2998bf589b24216705e8a3eec6c409 Mon Sep 17 00:00:00 2001 From: "David B. Kinder" Date: Thu, 26 May 2022 09:23:55 -0700 Subject: [PATCH] move buildtype above debugoptions in the scenario schema (adding to release_3.0 branch) 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 +++++++++---------- 24 files changed, 33 insertions(+), 33 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 42bcf3360..5d34c18ca 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 79603e9b0..b0ecf7891 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 4ad0ad183..c1b807b16 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 9ff217f93..eeab9928f 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 5e3c036f5..af099642c 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 7671e04cc..5f12af882 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 f9ba3c04c..e2f7b9397 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 db94c8475..e722f3304 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 5e3c036f5..af099642c 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 365899874..1602ac1f2 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 b44bca4fc..a54d1f8a0 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 df026e23c..10f0cfdf1 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 e7a9891ae..264750d52 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 ba442e3af..ae2ffbdcf 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 6d1d17c3b..88a27d63b 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 359b67120..e5fe0765f 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 ff4af6bdb..98089a6aa 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 20aaead6c..613078872 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 59b29bb1b..4a4ec6470 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 ac3a4e3ee..62bf129cf 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 7d6e105ce..b2ac0bfe2 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 61a57cb4c..cdbcaf38c 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 7728fadd5..f0b37b853 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 d9815dbe4..73477ca86 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. + +