From 2c9120752ef819e3c82194e734dae36902621e45 Mon Sep 17 00:00:00 2001 From: Corentin Date: Wed, 30 Jun 2021 05:11:57 +0900 Subject: [PATCH] Minor fixes + clean code + exclude hidden source file --- make.py | 3 +-- umake.py | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/make.py b/make.py index c5d40fb..040e043 100644 --- a/make.py +++ b/make.py @@ -23,8 +23,7 @@ class Config: COMPILE_FLAGS = f'-Wall -I{INCLUDE_DIR}' # Flags added for compiling (recommandation : `pkg-config --cflags`) LINK_FLAGS = '' # Flags added for linking (recommandation : `pkg-config --libs`) - CPP_HEADERS = INCLUDE_DIR.rglob('*.hpp') - CPP_SOURCES = SOURCE_DIR.rglob('*.cpp') + CPP_SOURCES = [filepath for filepath in SOURCE_DIR.rglob('*.cpp') if not filepath.name.startswith('.')] def main(): diff --git a/umake.py b/umake.py index 56e6050..cce27ee 100755 --- a/umake.py +++ b/umake.py @@ -26,7 +26,6 @@ class Config: COMPILE_FLAGS = f'-Wall -I{INCLUDE_DIR}' # Flags added for compiling (recommandation : `pkg-config --cflags`) LINK_FLAGS = '' # Flags added for linking (recommandation : `pkg-config --libs`) - CPP_HEADERS = INCLUDE_DIR.rglob('*.hpp') CPP_SOURCES = SOURCE_DIR.rglob('*.cpp') @@ -89,7 +88,7 @@ def make(config: Config): job = subprocess.run(cmd, check=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, shell=True) if job.returncode != 0: - error_paths.append((source_path, job.stdout.read() + job.stderr.read())) + error_paths.append((source_path, job.stdout + job.stderr)) break dependency_dict[str(source_path)] = job.stdout.split('.o: ')[1].replace('\n', '').replace('\\ ', '').split(' ') if error_paths: @@ -120,7 +119,7 @@ def make(config: Config): todo_list.append((source_path, cmd)) continue - if not todo_list: + if not todo_list and all([(config.BIN_DIR / app_path).exists() for app_path in config.APPS]): print(ConsoleColor.GREEN + 'Nothing to do' + ConsoleColor.ENDCOLOR) return