From 5ef305dfeeac947a91516e626854d9dac090447a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Lang=C3=B3?= Date: Wed, 22 Feb 2017 09:12:57 +0100 Subject: [PATCH] Avoid using global statement (#1606) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related issue: #1600 JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com --- tools/build.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/tools/build.py b/tools/build.py index 8154425e3..ae66c46ff 100755 --- a/tools/build.py +++ b/tools/build.py @@ -145,31 +145,27 @@ def generate_build_options(arguments): return build_options 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): - BUILD_DIR = arguments.builddir - else: - BUILD_DIR = path.join(PROJECT_DIR, arguments.builddir) + if arguments.clean and path.exists(arguments.builddir): + shutil.rmtree(arguments.builddir) - if arguments.clean and path.exists(BUILD_DIR): - shutil.rmtree(BUILD_DIR) - - if not path.exists(BUILD_DIR): - makedirs(BUILD_DIR) + if not path.exists(arguments.builddir): + makedirs(arguments.builddir) def configure_build(arguments): configure_output_dir(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) return subprocess.call(cmake_cmd) 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): print('=' * 30)