diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-04-28 23:48:44 +0400 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-04-28 23:48:44 +0400 |
commit | 7d1b40d890040c3d28f9b3423e3fdb9d019f2c86 (patch) | |
tree | 60f0ee16b70ae328d91efbf6b39a54ed7ede4459 | |
parent | 34c1699e7ed1761c061e9c0ce892238fb8122d96 (diff) |
* improve the clean code. Instead of doing it the dumb way, do it smarter.
-rw-r--r-- | SConstruct | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/SConstruct b/SConstruct index 78936a039c9..942bef078d6 100644 --- a/SConstruct +++ b/SConstruct @@ -264,23 +264,18 @@ if not quickie and do_clean: if os.path.exists(B.root_build_dir): print B.bc.HEADER+'Cleaning...'+B.bc.ENDC dirs = os.listdir(B.root_build_dir) - for dir in dirs: - if os.path.isdir(B.root_build_dir + dir) == 1: - print "clean dir %s"%(B.root_build_dir+dir) - shutil.rmtree(B.root_build_dir+dir) + for entry in dirs: + if os.path.isdir(B.root_build_dir + entry) == 1: + print "clean dir %s"%(B.root_build_dir+entry) + shutil.rmtree(B.root_build_dir+entry) + else: # remove file + print "remove file %s"%(B.root_build_dir+entry) + os.remove(B.root_build_dir+entry) for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak', 'extern/xvidcore/build/generic/platform.inc']: if os.path.exists(confile): print "clean file %s"%confile os.remove(confile) - - if platform in ('win32-vc', 'win32-mingw'): - makesdnafile = B.root_build_dir+'makesdna.exe' - else: - makesdnafile = B.root_build_dir+'makesdna' - if os.path.exists(makesdnafile): - print "removing", makesdnafile - os.remove(makesdnafile) print B.bc.OKGREEN+'...done'+B.bc.ENDC else: print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC |