YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid using global statement (#1606)

Browse Source 
Related issue: #1600

JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com
This commit is contained in:
László Langó
2017-02-22 09:12:57 +01:00
committed by GitHub
parent 54544163a9
commit 5ef305dfee
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/build.py
+8 -12
View File
@@ -145,31 +145,27 @@ def generate_build_options(arguments):
return build_options return build_options
def configure_output_dir(arguments): def configure_output_dir(arguments):
global BUILD_DIR if not path.isabs(arguments.builddir):
arguments.builddir = path.join(PROJECT_DIR, arguments.builddir)
if path.isabs(arguments.builddir): if arguments.clean and path.exists(arguments.builddir):
BUILD_DIR = arguments.builddir shutil.rmtree(arguments.builddir)
else:
BUILD_DIR = path.join(PROJECT_DIR, arguments.builddir)
if arguments.clean and path.exists(BUILD_DIR): if not path.exists(arguments.builddir):
shutil.rmtree(BUILD_DIR) makedirs(arguments.builddir)
if not path.exists(BUILD_DIR):
makedirs(BUILD_DIR)
def configure_build(arguments): def configure_build(arguments):
configure_output_dir(arguments) configure_output_dir(arguments)
build_options = generate_build_options(arguments) build_options = generate_build_options(arguments)
cmake_cmd = ['cmake', '-B' + BUILD_DIR, '-H' + PROJECT_DIR] cmake_cmd = ['cmake', '-B' + arguments.builddir, '-H' + PROJECT_DIR]
cmake_cmd.extend(build_options) cmake_cmd.extend(build_options)
return subprocess.call(cmake_cmd) return subprocess.call(cmake_cmd)
def build_jerry(arguments): def build_jerry(arguments):
return subprocess.call(['make', '--no-print-directory','-j', str(arguments.jobs), '-C', BUILD_DIR]) return subprocess.call(['make', '--no-print-directory','-j', str(arguments.jobs), '-C', arguments.builddir])
def print_result(ret): def print_result(ret):
print('=' * 30) print('=' * 30)