Use lipomerge pypi
This commit is contained in:
parent
e9372773d5
commit
96d244ae9e
5 changed files with 3 additions and 6 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -1,6 +1,3 @@
|
||||||
[submodule "sqlcipher"]
|
[submodule "sqlcipher"]
|
||||||
path = sqlcipher
|
path = sqlcipher
|
||||||
url = https://github.com/sqlcipher/sqlcipher.git
|
url = https://github.com/sqlcipher/sqlcipher.git
|
||||||
[submodule "lipo-dir-merge"]
|
|
||||||
path = lipo-dir-merge
|
|
||||||
url = https://github.com/faaxm/lipo-dir-merge.git
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,5 @@ include setup.py
|
||||||
recursive-include src *.h
|
recursive-include src *.h
|
||||||
recursive-include src *.c
|
recursive-include src *.c
|
||||||
include conanfile.py
|
include conanfile.py
|
||||||
include lipo-dir-merge/lipo-dir-merge.py
|
|
||||||
|
|
||||||
global-exclude *~ *.pyc
|
global-exclude *~ *.pyc
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit f44b429b4deed821f7a924d527ace236afe54543
|
|
||||||
|
|
@ -26,6 +26,7 @@ requires = [
|
||||||
"conan>=2.0",
|
"conan>=2.0",
|
||||||
"setuptools>=45",
|
"setuptools>=45",
|
||||||
"wheel",
|
"wheel",
|
||||||
|
"lipomerge",
|
||||||
]
|
]
|
||||||
build-backend = "setuptools.build_meta"
|
build-backend = "setuptools.build_meta"
|
||||||
|
|
||||||
|
|
|
||||||
3
setup.py
3
setup.py
|
|
@ -181,7 +181,8 @@ if __name__ == "__main__":
|
||||||
subprocess.run(
|
subprocess.run(
|
||||||
[
|
[
|
||||||
"python3",
|
"python3",
|
||||||
"lipo-dir-merge/lipo-dir-merge.py",
|
"-m",
|
||||||
|
"lipomerge",
|
||||||
lipo_dir_merge_src,
|
lipo_dir_merge_src,
|
||||||
lipo_dir_merge_dst,
|
lipo_dir_merge_dst,
|
||||||
lipo_dir_merge_result,
|
lipo_dir_merge_result,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue