mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-31 10:19:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

prepare.py: improve previous execution detection

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-12-17 14:40:54 +01:00
parent 9cca42fdc8
commit 3833516dff
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
prepare.py
View file

@ -535,6 +535,13 @@ def main(argv=None):
if x not in selected_platforms:
selected_platforms.append(x)
if os.path.isdir('WORK') and not args.clean:
warning("Working directory WORK already exists. Please remove it (option -C or -c) before re-executing CMake "
"to avoid conflicts between executions.")
if os.path.isfile('Makefile'):
Popen("make help-prepare-options".split(" "))
return 0
for platform in selected_platforms:
target = targets[platform]
@ -543,9 +550,6 @@ def main(argv=None):
else:
retcode = prepare.run(target, args.debug, False, args.list_cmake_variables, args.force, additional_args)
if retcode != 0:
if retcode == 51:
Popen("make help-prepare-options".split(" "))
retcode = 0
return retcode
if args.clean:
@ -562,9 +566,9 @@ def main(argv=None):
elif args.generator == "Unix Makefiles":
generate_makefile(selected_platforms, '$(MAKE) -C')
elif args.generator == "Xcode":
print("You can now open Xcode project with: open WORK/cmake/Project.xcodeproj")
info("You can now open Xcode project with: open WORK/cmake/Project.xcodeproj")
else:
print("Not generating meta-makefile for generator {}.".format(args.generator))
info("Not generating meta-makefile for generator {}.".format(args.generator))
return 0