config_tools: fix build issue

fix build issue

Tracked-On: #6691
Signed-off-by: Weiyi Feng <weiyix.feng@intel.com>

misc/config_tools/configurator/README.md

@@ -8,7 +8,6 @@ This version is based on Tauri, WIP.
 
 - [x] Linux (.deb, AppImage)
 - [x] Windows 7,8,10 (.exe, .msi)
-- [x] macOS (.app, .dmg)
 
 
 ## Setting Up
@@ -18,6 +17,12 @@ This version is based on Tauri, WIP.
 Please follow [this guide](https://tauri.studio/docs/getting-started/prerequisites)
 to install system dependencies **(including yarn)**.
 
+#### Linux
+
+In Linux, 
+
+#### Windows
+
 In Windows, [chocolatey](https://chocolatey.org/) is a Windows package manager,
 you can use `choco install xsltproc` to install `xsltproc` package,
 which provide `xmllint` command.
@@ -29,17 +34,17 @@ which provide `xmllint` command.
 ```bash
 sudo apt install git
 git clone https://github.com/projectacrn/acrn-hypervisor
-cd acrn-hypervisor/misc/config_tools/configurator
+cd acrn-hypervisor/misc/config_tools
+python3 -m pip install -r requirements.txt
+cd configurator
 python3 -m pip install -r requirements.txt
 yarn
 ```
 
-#### Windows && macOS
+#### Windows
 
 Similar to Linux.
 
-On macOS, you may need to install git and python3 via `brew`.
-
 In the Windows environment maybe you need to install git and python3 via chocolatey or manually,
 and replace the command line `python3` with `py -3`.
 
@@ -53,7 +58,7 @@ Run this command in the acrn-hypervisor directory.
 make configurator
 ```
 
-#### Windows/macOS
+#### Windows
 
 Run following command in the 'acrn-hypervisor' directory.
 
@@ -81,7 +86,7 @@ sudo apt install ./build/acrn-configurator_*.deb
 acrn-configurator
 ```
 
-#### Windows/macOS
+#### Windows
 
 You can find msi(Windows)/dmg(macOS) folder under the
 `misc/config_tools/configurator/src-tauri/target/release/bundle`

misc/config_tools/configurator/requirements.txt

@@ -1,3 +1,7 @@
 build
 tqdm
 requests
+lxml
+xmltodict
+sphinx
+bs4

misc/config_tools/configurator/src-tauri/Cargo.toml

@@ -17,7 +17,7 @@ tauri-build = { version = "1.0.0-rc.5", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.0.0-rc.6", features = ["api-all"] }
+tauri = { version = "1.0.0-rc.6", features = ["api-all", "devtools"] }
 log = "0.4"
 glob = "0.3"
 dirs = "4.0"

misc/config_tools/configurator/src/components/HelloWorld.vue

@@ -1,21 +0,0 @@
-<script setup>
-import { ref } from 'vue'
-
-defineProps({
-  msg: String
-})
-
-const count = ref(0)
-</script>
-
-<template>
-  <h1>{{ msg }}</h1>
-
-  <button type="button" @click="count++">count is: {{ count }}</button>
-</template>
-
-<style scoped>
-a {
-  color: #42b983;
-}
-</style>

misc/config_tools/configurator/src/components/common/ControlBar.vue

@@ -48,8 +48,7 @@ export default {
       })
     },
     close: () => {
-      console.log("close")
+      appWindow.close()
-      alert("close")
     }
   }
 }

misc/config_tools/configurator/src/main.js

@@ -58,7 +58,9 @@ if (!isTauri) {
 async function main() {
     console.log("Pyodide Load Begin")
     let t1 = Date.now();
-    let pyodide = await loadPyodide();
+    let pyodide = await loadPyodide({
+        indexURL: '/thirdLib/pyodide/'
+    });
     await pyodide.loadPackage(['micropip', 'lxml', 'beautifulsoup4'])
     await pyodide.runPythonAsync(`
         import micropip

misc/config_tools/configurator/src/pages/Config/Scenario.vue

@@ -67,7 +67,7 @@ export default {
   },
   methods: {
     newScenario(data) {
-      this.$emit('update:scenario', data)
+      this.$emit('scenarioUpdate', data)
     },
     loadScenario() {
       if (this.currentSelectedScenario.length > 0) {

misc/config_tools/scenario_config/jsonschema/converter.py

@@ -25,6 +25,7 @@ open(output_file, 'w', encoding='utf-8').write(json_schema)
 ```
 
 """
+__package__ = 'scenario_config.jsonschema'
 import os
 import json
 import re