From: Marc-André Lureau <marcandre.lur...@redhat.com>
This is just moving qapi-gen.py and related subdir to qemu-common, to
ease review and proceed step by step. The following patches will move
related necessary code, tests etc.
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
---
docs/conf.py | 2 +-
meson.build | 19 ++-----------------
MAINTAINERS | 4 ++--
subprojects/qemu-common/meson.build | 2 ++
subprojects/qemu-common/scripts/meson.build | 3 +++
.../qemu-common/scripts}/qapi-gen.py | 0
.../qemu-common/scripts}/qapi/.flake8 | 0
.../qemu-common/scripts}/qapi/.isort.cfg | 0
.../qemu-common/scripts}/qapi/__init__.py | 0
.../qemu-common/scripts}/qapi/commands.py | 0
.../qemu-common/scripts}/qapi/common.py | 0
.../qemu-common/scripts}/qapi/error.py | 0
.../qemu-common/scripts}/qapi/events.py | 0
.../qemu-common/scripts}/qapi/expr.py | 0
.../qemu-common/scripts}/qapi/gen.py | 0
.../qemu-common/scripts}/qapi/introspect.py | 0
.../qemu-common/scripts}/qapi/main.py | 0
.../qemu-common/scripts/qapi/meson.build | 16 ++++++++++++++++
.../qemu-common/scripts}/qapi/mypy.ini | 0
.../qemu-common/scripts}/qapi/parser.py | 0
.../qemu-common/scripts}/qapi/pylintrc | 0
.../qemu-common/scripts}/qapi/schema.py | 0
.../qemu-common/scripts}/qapi/source.py | 0
.../qemu-common/scripts}/qapi/types.py | 0
.../qemu-common/scripts}/qapi/visit.py | 0
tests/qapi-schema/meson.build | 2 +-
26 files changed, 27 insertions(+), 21 deletions(-)
create mode 100644 subprojects/qemu-common/scripts/meson.build
rename {scripts => subprojects/qemu-common/scripts}/qapi-gen.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/.flake8 (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/.isort.cfg (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/__init__.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/commands.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/common.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/error.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/events.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/expr.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/gen.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/introspect.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/main.py (100%)
create mode 100644 subprojects/qemu-common/scripts/qapi/meson.build
rename {scripts => subprojects/qemu-common/scripts}/qapi/mypy.ini (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/parser.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/pylintrc (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/schema.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/source.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/types.py (100%)
rename {scripts => subprojects/qemu-common/scripts}/qapi/visit.py (100%)
diff --git a/docs/conf.py b/docs/conf.py
index e33cf3d38121..02dcd987b426 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -56,7 +56,7 @@
# Our extensions are in docs/sphinx; the qapidoc extension requires
# the QAPI modules from scripts/.
sys.path.insert(0, os.path.join(qemu_docdir, "sphinx"))
-sys.path.insert(0, os.path.join(qemu_docdir, "../scripts"))
+sys.path.insert(0, os.path.join(qemu_docdir,
"../subprojects/qemu-common/scripts"))
# -- General configuration ------------------------------------------------
diff --git a/meson.build b/meson.build
index 254eb1263a66..97e8ab37eb08 100644
--- a/meson.build
+++ b/meson.build
@@ -1582,6 +1582,8 @@ if libbpf.found() and not cc.links('''
endif
qemu_common = subproject('qemu-common')
+qapi_gen = qemu_common.get_variable('qapi_gen')
+qapi_gen_depends = qemu_common.get_variable('qapi_gen_depends')
qemu_common = qemu_common.get_variable('qemu_common_dep')
#################
@@ -2790,23 +2792,6 @@ genh += configure_file(output: 'config-host.h',
configuration: config_host_data)
hxtool = find_program('scripts/hxtool')
shaderinclude = find_program('scripts/shaderinclude.pl')
-qapi_gen = find_program('scripts/qapi-gen.py')
-qapi_gen_depends = [ meson.current_source_dir() / 'scripts/qapi/__init__.py',
- meson.current_source_dir() / 'scripts/qapi/commands.py',
- meson.current_source_dir() / 'scripts/qapi/common.py',
- meson.current_source_dir() / 'scripts/qapi/error.py',
- meson.current_source_dir() / 'scripts/qapi/events.py',
- meson.current_source_dir() / 'scripts/qapi/expr.py',
- meson.current_source_dir() / 'scripts/qapi/gen.py',
- meson.current_source_dir() / 'scripts/qapi/introspect.py',
- meson.current_source_dir() / 'scripts/qapi/parser.py',
- meson.current_source_dir() / 'scripts/qapi/schema.py',
- meson.current_source_dir() / 'scripts/qapi/source.py',
- meson.current_source_dir() / 'scripts/qapi/types.py',
- meson.current_source_dir() / 'scripts/qapi/visit.py',
- meson.current_source_dir() / 'scripts/qapi/common.py',
- meson.current_source_dir() / 'scripts/qapi-gen.py'
-]
tracetool = [
python, files('scripts/tracetool.py'),
diff --git a/MAINTAINERS b/MAINTAINERS
index 450abd025271..b45511dab550 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2847,8 +2847,8 @@ F: tests/unit/test-*-visitor.c
F: tests/unit/test-qapi-*.c
F: tests/unit/test-qmp-*.c
F: tests/unit/test-visitor-serialization.c
-F: scripts/qapi-gen.py
-F: scripts/qapi/*
+F: subprojects/qemu-common/scripts/qapi-gen.py
+F: subprojects/qemu-common/scripts/qapi/*
F: docs/sphinx/qapidoc.py
F: docs/devel/qapi*
T: git https://repo.or.cz/qemu/armbru.git qapi-next
diff --git a/subprojects/qemu-common/meson.build
b/subprojects/qemu-common/meson.build
index 8969b08473ef..207e53991061 100644
--- a/subprojects/qemu-common/meson.build
+++ b/subprojects/qemu-common/meson.build
@@ -6,3 +6,5 @@ project('qemu-common', 'c',
qemu_common_dep = declare_dependency(
include_directories: include_directories('include'),
)
+
+subdir('scripts')
diff --git a/subprojects/qemu-common/scripts/meson.build
b/subprojects/qemu-common/scripts/meson.build
new file mode 100644
index 000000000000..626bed6dcdfe
--- /dev/null
+++ b/subprojects/qemu-common/scripts/meson.build
@@ -0,0 +1,3 @@
+qapi_gen = find_program('qapi-gen.py')
+
+subdir('qapi')
diff --git a/scripts/qapi-gen.py b/subprojects/qemu-common/scripts/qapi-gen.py
similarity index 100%
rename from scripts/qapi-gen.py
rename to subprojects/qemu-common/scripts/qapi-gen.py
diff --git a/scripts/qapi/.flake8 b/subprojects/qemu-common/scripts/qapi/.flake8
similarity index 100%
rename from scripts/qapi/.flake8
rename to subprojects/qemu-common/scripts/qapi/.flake8
diff --git a/scripts/qapi/.isort.cfg
b/subprojects/qemu-common/scripts/qapi/.isort.cfg
similarity index 100%
rename from scripts/qapi/.isort.cfg
rename to subprojects/qemu-common/scripts/qapi/.isort.cfg
diff --git a/scripts/qapi/__init__.py
b/subprojects/qemu-common/scripts/qapi/__init__.py
similarity index 100%
rename from scripts/qapi/__init__.py
rename to subprojects/qemu-common/scripts/qapi/__init__.py
diff --git a/scripts/qapi/commands.py
b/subprojects/qemu-common/scripts/qapi/commands.py
similarity index 100%
rename from scripts/qapi/commands.py
rename to subprojects/qemu-common/scripts/qapi/commands.py
diff --git a/scripts/qapi/common.py
b/subprojects/qemu-common/scripts/qapi/common.py
similarity index 100%
rename from scripts/qapi/common.py
rename to subprojects/qemu-common/scripts/qapi/common.py
diff --git a/scripts/qapi/error.py
b/subprojects/qemu-common/scripts/qapi/error.py
similarity index 100%
rename from scripts/qapi/error.py
rename to subprojects/qemu-common/scripts/qapi/error.py
diff --git a/scripts/qapi/events.py
b/subprojects/qemu-common/scripts/qapi/events.py
similarity index 100%
rename from scripts/qapi/events.py
rename to subprojects/qemu-common/scripts/qapi/events.py
diff --git a/scripts/qapi/expr.py b/subprojects/qemu-common/scripts/qapi/expr.py
similarity index 100%
rename from scripts/qapi/expr.py
rename to subprojects/qemu-common/scripts/qapi/expr.py
diff --git a/scripts/qapi/gen.py b/subprojects/qemu-common/scripts/qapi/gen.py
similarity index 100%
rename from scripts/qapi/gen.py
rename to subprojects/qemu-common/scripts/qapi/gen.py
diff --git a/scripts/qapi/introspect.py
b/subprojects/qemu-common/scripts/qapi/introspect.py
similarity index 100%
rename from scripts/qapi/introspect.py
rename to subprojects/qemu-common/scripts/qapi/introspect.py
diff --git a/scripts/qapi/main.py b/subprojects/qemu-common/scripts/qapi/main.py
similarity index 100%
rename from scripts/qapi/main.py
rename to subprojects/qemu-common/scripts/qapi/main.py
diff --git a/subprojects/qemu-common/scripts/qapi/meson.build
b/subprojects/qemu-common/scripts/qapi/meson.build
new file mode 100644
index 000000000000..5f73a966f344
--- /dev/null
+++ b/subprojects/qemu-common/scripts/qapi/meson.build
@@ -0,0 +1,16 @@
+qapi_gen_depends = files(
+ '__init__.py',
+ 'commands.py',
+ 'common.py',
+ 'error.py',
+ 'events.py',
+ 'expr.py',
+ 'gen.py',
+ 'introspect.py',
+ 'parser.py',
+ 'schema.py',
+ 'source.py',
+ 'types.py',
+ 'visit.py',
+ 'common.py',
+)
diff --git a/scripts/qapi/mypy.ini
b/subprojects/qemu-common/scripts/qapi/mypy.ini
similarity index 100%
rename from scripts/qapi/mypy.ini
rename to subprojects/qemu-common/scripts/qapi/mypy.ini
diff --git a/scripts/qapi/parser.py
b/subprojects/qemu-common/scripts/qapi/parser.py
similarity index 100%
rename from scripts/qapi/parser.py
rename to subprojects/qemu-common/scripts/qapi/parser.py
diff --git a/scripts/qapi/pylintrc
b/subprojects/qemu-common/scripts/qapi/pylintrc
similarity index 100%
rename from scripts/qapi/pylintrc
rename to subprojects/qemu-common/scripts/qapi/pylintrc
diff --git a/scripts/qapi/schema.py
b/subprojects/qemu-common/scripts/qapi/schema.py
similarity index 100%
rename from scripts/qapi/schema.py
rename to subprojects/qemu-common/scripts/qapi/schema.py
diff --git a/scripts/qapi/source.py
b/subprojects/qemu-common/scripts/qapi/source.py
similarity index 100%
rename from scripts/qapi/source.py
rename to subprojects/qemu-common/scripts/qapi/source.py
diff --git a/scripts/qapi/types.py
b/subprojects/qemu-common/scripts/qapi/types.py
similarity index 100%
rename from scripts/qapi/types.py
rename to subprojects/qemu-common/scripts/qapi/types.py
diff --git a/scripts/qapi/visit.py
b/subprojects/qemu-common/scripts/qapi/visit.py
similarity index 100%
rename from scripts/qapi/visit.py
rename to subprojects/qemu-common/scripts/qapi/visit.py
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
index c18dd7d02f72..2c676360041e 100644
--- a/tests/qapi-schema/meson.build
+++ b/tests/qapi-schema/meson.build
@@ -1,5 +1,5 @@
test_env = environment()
-test_env.set('PYTHONPATH', meson.project_source_root() / 'scripts')
+test_env.set('PYTHONPATH', meson.project_source_root() /
'subprojects/qemu-common/scripts')
test_env.set('PYTHONIOENCODING', 'utf-8')
schemas = [
--
2.37.0.rc0
