Use lipomerge pypi

2025-04-09 02:43:43 +08:00 · 2025-04-09 02:43:43 +08:00 · 96d244ae9e
commit 96d244ae9e
parent e9372773d5
5 changed files with 3 additions and 6 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +1,3 @@
 [submodule "sqlcipher"]
 	path = sqlcipher
 	url = https://github.com/sqlcipher/sqlcipher.git
-[submodule "lipo-dir-merge"]
-	path = lipo-dir-merge
-	url = https://github.com/faaxm/lipo-dir-merge.git
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -5,6 +5,5 @@ include setup.py
 recursive-include src *.h
 recursive-include src *.c
 include conanfile.py
-include lipo-dir-merge/lipo-dir-merge.py

 global-exclude *~ *.pyc
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit f44b429b4deed821f7a924d527ace236afe54543
--- a/pyproject.toml
+++ b/pyproject.toml
@ -26,6 +26,7 @@ requires = [
    "conan>=2.0",
    "setuptools>=45",
    "wheel",
+    "lipomerge",
 ]
 build-backend = "setuptools.build_meta"

--- a/setup.py
+++ b/setup.py
@ -181,7 +181,8 @@ if __name__ == "__main__":
        subprocess.run(
            [
                "python3",
-                "lipo-dir-merge/lipo-dir-merge.py",
+                "-m",
+                "lipomerge",
                lipo_dir_merge_src,
                lipo_dir_merge_dst,
                lipo_dir_merge_result,
				`@ -1 +0,0 @@`
				`Subproject commit f44b429b4deed821f7a924d527ace236afe54543`