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

prepare.py: use correct build type when using --list-features option

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-09-07 12:06:56 +02:00
parent 0a4d30aa3f
commit db84eae27f
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
prepare.py
View file

@ -35,9 +35,9 @@ sys.dont_write_bytecode = True
sys.path.insert(0, 'submodules/cmake-builder')
try:
import prepare
except:
except Exception as e:
error(
"Could not find prepare module, probably missing submodules/cmake-builder? Try running:\ngit submodule update --init --recursive")
"Could not find prepare module: {}, probably missing submodules/cmake-builder? Try running:\ngit submodule update --init --recursive".format(e))
exit(1)
@ -544,10 +544,12 @@ def main(argv=None):
if args.list_features:
tmpdir = tempfile.mkdtemp(prefix="linphone-iphone")
tmptarget = IOSarm64Target()
tmptarget.abs_cmake_dir = tmpdir
option_regex = re.compile("ENABLE_(.*):(.*)=(.*)")
option_list = [""]
for line in Popen(tmptarget.cmake_command("Debug", False, True, additional_args),
build_type = 'Debug' if args.debug else 'Release'
for line in Popen(tmptarget.cmake_command(build_type, False, True, additional_args),
cwd=tmpdir, shell=False, stdout=PIPE).stdout.readlines():
match = option_regex.match(line)
if match is not None:

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit 5ff6590ab1b9e97bc97eadaa4f64353f266e2d9f
Subproject commit 0150373697676183e6735d69620d6e7dc5545134