From 3a133d31387e0cc5c813edb31037fc55e3d72001 Mon Sep 17 00:00:00 2001 From: "David B. Kinder" Date: Wed, 11 May 2022 13:21:28 -0700 Subject: [PATCH] Fix make configurator not picking up schema changes Artificates left over from a previous make configurator build prevented changes to a schema (.xsd) file from getting incorporated into a subsequent make configurator build. Tracked-on: #7461 Signed-off-by: David B. Kinder --- misc/config_tools/configurator/README.md | 4 +++- misc/packaging/gen_acrn_deb.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/misc/config_tools/configurator/README.md b/misc/config_tools/configurator/README.md index 37d58a291..1cdd17570 100644 --- a/misc/config_tools/configurator/README.md +++ b/misc/config_tools/configurator/README.md @@ -78,15 +78,17 @@ make configurator Run following command in the 'acrn-hypervisor' directory. ```shell -cd misc/config_tools +cd misc\config_tools python scenario_config/schema_slicer.py python scenario_config/jsonschema/convert.py xmllint --xinclude schema/datachecks.xsd > schema/allchecks.xsd python -m build +del configurator/packages/configurator/thirdLib/acrn_config_tools-3.0-py3-none-any.whl cd configurator python packages/configurator/thirdLib/manager.py install +yarn yarn build ``` diff --git a/misc/packaging/gen_acrn_deb.py b/misc/packaging/gen_acrn_deb.py index c8529552e..dce60c848 100644 --- a/misc/packaging/gen_acrn_deb.py +++ b/misc/packaging/gen_acrn_deb.py @@ -209,6 +209,7 @@ def create_configurator_deb(build_dir): add_cmd_list(cmd_list, 'python3 converter.py', scenario_config_path / "jsonschema") add_cmd_list(cmd_list, 'bash -c "xmllint --xinclude schema/datachecks.xsd > schema/allchecks.xsd"', config_tools_path) add_cmd_list(cmd_list, 'python3 -m build', config_tools_path) + add_cmd_list(cmd_list, 'bash -c "rm -f ./configurator/packages/configurator/thirdLib/acrn_config_tools-3.0-py3-none-any.whl"', config_tools_path) add_cmd_list(cmd_list, 'python3 packages/configurator/thirdLib/manager.py install', configurator_path) add_cmd_list(cmd_list, 'yarn', configurator_path) add_cmd_list(cmd_list, 'yarn build', configurator_path)