aboutsummaryrefslogtreecommitdiffstats
path: root/src/scripts/cleanup.py
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-12-11 18:18:35 -0500
committerJack Lloyd <[email protected]>2017-12-11 18:18:35 -0500
commit5094c0c88398ed98758e22f9d46ea6efa7d0e910 (patch)
treeba4435214e9ad95a879bf52ce165114620de7042 /src/scripts/cleanup.py
parentf46c944c92a055f28d3eb8e838d7ea810dd18479 (diff)
Fix make clean target
It removed the doc output dir, so this sequence: $ ./configure.py $ make clean $ make docs would fail
Diffstat (limited to 'src/scripts/cleanup.py')
-rwxr-xr-xsrc/scripts/cleanup.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/scripts/cleanup.py b/src/scripts/cleanup.py
index 7660076dc..d2aaf4303 100755
--- a/src/scripts/cleanup.py
+++ b/src/scripts/cleanup.py
@@ -96,17 +96,13 @@ def main(args=None):
remove_file(build_config['makefile_path'])
remove_dir(build_dir)
else:
- for dir_type in ['libobj_dir', 'cliobj_dir', 'testobj_dir']:
+ for dir_type in ['libobj_dir', 'cliobj_dir', 'testobj_dir', 'doc_output_dir_manual', 'doc_output_dir_doxygen']:
dir_path = build_config[dir_type]
- remove_all_in_dir(dir_path)
+ if dir_path:
+ remove_all_in_dir(dir_path)
remove_file(build_config['doc_stamp_file'])
- try:
- shutil.rmtree(build_config['doc_output_dir'])
- except OSError:
- pass
-
remove_file(build_config['cli_exe'])
remove_file(build_config['test_exe'])