witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

fix prepare.py when no all arch used

Browse source
This commit is contained in:
Benjamin Reis 2017-06-06 10:44:17 +02:00
parent 84a845e8ed
commit db03144daa
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
prepare.py
View file

@ -256,13 +256,22 @@ class IOSPreparator(prepare.Preparator):
multiarch = ""
for arch in platforms[1:]:
multiarch += \
"""\t\t\tif test -f "$${arch}_path"; then \\
\t\t\t\tall_paths=`echo $$all_paths $${arch}_path`; \\
\t\t\t\tall_archs="$$all_archs,{arch}" ; \\
\t\t\telse \\
\t\t\t\techo "WARNING: archive `basename $$archive` exists in {first_arch} tree but does not exists in {arch} tree: $${arch}_path."; \\
"""\t\t\tif {static}; then \\
\t\t\t\tif test -f "$${arch}_path"; then \\
\t\t\t\t\tall_paths=`echo $$all_paths $${arch}_path`; \\
\t\t\t\t\tall_archs="$$all_archs,{arch}" ; \\
\t\t\t\telse \\
\t\t\t\t\techo "WARNING: archive `basename $$archive` exists in {first_arch} tree but does not exists in {arch} tree: $${arch}_path."; \\
\t\t\t\tfi; \\
\t\t\t else \\
\t\t\t\tif test -f "$${arch}_path/$$framework_name"; then \\
\t\t\t\t\tall_paths=`echo $$all_paths $${arch}_path/$$framework_name`; \\
\t\t\t\t\tall_archs="$$all_archs,{arch}" ; \\
\t\t\t\telse \\
\t\t\t\t\techo "WARNING: archive `basename $$archive` exists in {first_arch} tree but does not exists in {arch} tree: $${arch}_path."; \\
\t\t\t\tfi; \\
\t\t\tfi; \\
""".format(first_arch=platforms[0], arch=arch)
""".format(first_arch=platforms[0], arch=arch, static=static)
makefile = """
archs={archs}
LINPHONE_IPHONE_VERSION=$(shell git describe --always)
@ -307,10 +316,11 @@ sdk:
\t\t\tall_archs="{first_arch}"; \\
\t\t\tarchive_name=`basename $$archive`; \\
\t\t\tframework_name=`echo $$archive_name | cut -d '.' -f 1`; \\
\t\t\tall_paths=`echo $$all_paths/$$framework_name`; \\
\t\t\tmkdir -p `dirname $$destpath`; \\
{multiarch} \\
\t\t\techo "[{archs}] Mixing `basename $$archive` in $$destpath"; \\
\t\t\tlipo -create -output $$destpath/$$framework_name $$armv7_path/$$framework_name $$arm64_path/$$framework_name $$x86_64_path/$$framework_name; \\
\t\t\tlipo -create -output $$destpath/$$framework_name $$all_paths; \\
\t\tdone; \\
\tfi; \\
\tif test -s WORK/ios-{first_arch}/Build/dummy_libraries/dummy_libraries.txt; then \\