Replace Git Submodule with Meson WrapDB

for the convenience of switching branches.
minghongx · May 15, 2023 · 62ceb45 · 62ceb45
1 parent b03eefa
commit 62ceb45
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 11 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-    "name": "JetBot",
+    "name": "AMR",
 
     "build": {
         "dockerfile": "./Dockerfile",

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
+# Meson subprojects
+/subprojects/*
+!/subprojects/*.wrap
+
 nohup.out
 
 # Byte-compiled / optimized / DLL files

diff --git a/.gitmodules b/.gitmodules
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
     "files.exclude": {
-        "ext/": true,
+        "subprojects/": true,
         "**/__pycache__/": true,
     },
 

diff --git a/ext/pybind11 b/ext/pybind11
diff --git a/meson.build b/meson.build
@@ -10,11 +10,8 @@ inc = include_directories('inc')
 py = import('python').find_installation('python3.10')
 
 # https://mesonbuild.com/Wrapdb-projects.html
-# https://github.com/scipy/scipy/blob/main/scipy/meson.build#L93-L119
 # https://github.com/mesonbuild/meson/issues/4677
-pybind11 = declare_dependency(
-    include_directories : include_directories('../ext/pybind11/include'),
-)
+pybind11 = dependency('pybind11')
 
 subdir('nodes')
 subdir('pywrapcc')

diff --git a/subprojects/pybind11.wrap b/subprojects/pybind11.wrap
@@ -0,0 +1,13 @@
+[wrap-file]
+directory = pybind11-2.10.4
+source_url = https://github.com/pybind/pybind11/archive/refs/tags/v2.10.4.tar.gz
+source_filename = pybind11-2.10.4.tar.gz
+source_hash = 832e2f309c57da9c1e6d4542dedd34b24e4192ecb4d62f6f4866a737454c9970
+patch_filename = pybind11_2.10.4-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/pybind11_2.10.4-1/get_patch
+patch_hash = 9489d0cdc1244078a3108c52b4591a6f07f3dc30ca7299d3a3c42b84fa763396
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/pybind11_2.10.4-1/pybind11-2.10.4.tar.gz
+wrapdb_version = 2.10.4-1
+
+[provide]
+pybind11 = pybind11_dep