diff --git a/.gitmodules b/.gitmodules index 56b5619..4ded6a3 100644 --- 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 diff --git a/MANIFEST.in b/MANIFEST.in index b59656f..ab61d1b 100644 --- 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 diff --git a/lipo-dir-merge b/lipo-dir-merge deleted file mode 160000 index f44b429..0000000 --- a/lipo-dir-merge +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f44b429b4deed821f7a924d527ace236afe54543 diff --git a/pyproject.toml b/pyproject.toml index a6e5c04..8b845b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,6 +26,7 @@ requires = [ "conan>=2.0", "setuptools>=45", "wheel", + "lipomerge", ] build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py index e20289d..fae65e2 100644 --- 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,