Update cmake-builder + Fix naming of functions in prepare.py.

This commit is contained in:
Ghislain MARY 2016-06-21 18:40:34 +02:00
parent 7bb7d4b913
commit d87354ad91
2 changed files with 5 additions and 5 deletions

View file

@ -165,9 +165,9 @@ class IOSPreparator(prepare.Preparator):
error("No package manager found. Please README or install brew using:\n\truby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\"")
return "brew"
def check_tools(self):
def check_environment(self):
reterr = 0
reterr |= prepare.Preparator.check_tools(self)
reterr |= prepare.Preparator.check_environment(self)
package_manager_info = {"brew-pkg-config": "pkg-config",
"sudo port-pkg-config": "pkgconfig",
"brew-binary-path": "/usr/local/bin/",
@ -343,8 +343,8 @@ help: help-prepare-options
def main():
preparator = IOSPreparator()
preparator.parse_args()
if preparator.check_tools() != 0:
preparator.show_missing_dependencies()
if preparator.check_environment() != 0:
preparator.show_environment_errors()
return 1
preparator.install_git_hook()
return preparator.run()

@ -1 +1 @@
Subproject commit 3ac4d6737a179f26f3823decdc681193ff39d9a3
Subproject commit a4fbcbee40e7c9b9ef3ec3f7b0e95e3440906d89