From 21a3ee89ba28dd991c549ca664701ef7f5d79f55 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Mon, 6 Jan 2025 15:57:16 -0700
Subject: [PATCH] meson: Migrate genconfig submodule to subproject

---
 .gitmodules                |  3 ---
 genconfig                  |  1 -
 meson.build                | 14 +++++---------
 scripts/archive-source.sh  |  2 +-
 subprojects/.gitignore     |  1 +
 subprojects/genconfig.wrap |  4 ++++
 6 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 160000 genconfig
 create mode 100644 subprojects/genconfig.wrap

diff --git a/.gitmodules b/.gitmodules
index 9bb9f251d2..73cae4cd4d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,6 +43,3 @@
 [submodule "tests/lcitool/libvirt-ci"]
 	path = tests/lcitool/libvirt-ci
 	url = https://gitlab.com/libvirt/libvirt-ci.git
-[submodule "genconfig"]
-	path = genconfig
-	url = https://github.com/mborgerson/genconfig.git
diff --git a/genconfig b/genconfig
deleted file mode 160000
index 44bab849ce..0000000000
--- a/genconfig
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 44bab849ce87fceafd74703bfcf2b61a1a1b738f
diff --git a/meson.build b/meson.build
index 95c3ee311e..172017a11d 100644
--- a/meson.build
+++ b/meson.build
@@ -2336,8 +2336,6 @@ if vulkan.found()
                                      dependencies: vulkan)
 endif
 
-genconfig = declare_dependency(include_directories: 'genconfig')
-
 openssl = dependency('openssl', method: 'pkg-config', required: true)
 
 if host_os == 'windows'
@@ -2375,6 +2373,9 @@ implot_proj = subproject('implot', required: true,
                          default_options: ['default_library=static'])
 implot = implot_proj.get_variable('implot_dep')
 
+genconfig_proj = subproject('genconfig', required: true)
+genconfig = genconfig_proj.get_variable('cnode_dep')
+
 subdir('thirdparty')
 
 #################
@@ -3627,16 +3628,11 @@ qemu_version = custom_target('qemu-version.h',
                              build_by_default: true,
                              build_always_stale: true)
 
-genconfig_cmd = [
-  python, files('genconfig/gen_config.py'),
-  meson.current_source_dir() / 'config_spec.yml', 'xemu-config.h'
-]
-
 xemu_config = custom_target('xemu-config.h',
                             output: 'xemu-config.h',
                             input: [ files('config_spec.yml') ],
-                            command: genconfig_cmd,
-                            depend_files: files('config_spec.yml'))
+                            command : [python, genconfig_proj.get_variable('gen_config_script_path'), '@INPUT@', '@OUTPUT@'],
+                            )
 
 genh += qemu_version
 genh += xemu_version
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
index 2166048199..de23290c63 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -35,7 +35,7 @@ sub_deinit=""
 
 # xemu extras
 subprojects="$subprojects glslang SPIRV-Reflect volk VulkanMemoryAllocator
-  nv2a_vsh_cpu tomlplusplus cpp-httplib xxhash imgui implot"
+  nv2a_vsh_cpu tomlplusplus cpp-httplib xxhash imgui implot genconfig"
 
 function cleanup() {
     local status=$?
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index f9a4ba8131..8930672a30 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -28,3 +28,4 @@ cpp-httplib
 xxHash-*
 imgui
 implot
+genconfig
diff --git a/subprojects/genconfig.wrap b/subprojects/genconfig.wrap
new file mode 100644
index 0000000000..c4664941d5
--- /dev/null
+++ b/subprojects/genconfig.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+url=https://github.com/mborgerson/genconfig.git
+revision=42f85f9a2457e61d7e32542c07723565a284fcd6
+depth=1