From 7d1b40d890040c3d28f9b3423e3fdb9d019f2c86 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 28 Apr 2008 19:48:44 +0000 Subject: * improve the clean code. Instead of doing it the dumb way, do it smarter. --- SConstruct | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'SConstruct') 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 -- cgit v1.2.3 From 4e9cbe2ac757f7d40439490a2a7cf267727d79e8 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Thu, 1 May 2008 13:54:25 +0000 Subject: * copy plugin header stuffies too. --- SConstruct | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 942bef078d6..65e96e251d5 100644 --- a/SConstruct +++ b/SConstruct @@ -398,9 +398,26 @@ for tp, tn, tf in os.walk('release/plugins'): if '.svn' in tn: tn.remove('.svn') for f in tf: + print ">>>", env['BF_INSTALLDIR'], tp, f pluglist.append(tp+os.sep+f) plugtargetlist.append(env['BF_INSTALLDIR']+tp[7:]+os.sep+f) +# header files for plugins +pluglist.append('source/blender/blenpluginapi/documentation.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'documentation.h') +pluglist.append('source/blender/blenpluginapi/externdef.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'externdef.h') +pluglist.append('source/blender/blenpluginapi/floatpatch.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'floatpatch.h') +pluglist.append('source/blender/blenpluginapi/iff.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'iff.h') +pluglist.append('source/blender/blenpluginapi/plugin.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'plugin.h') +pluglist.append('source/blender/blenpluginapi/util.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'util.h') +pluglist.append('source/blender/blenpluginapi/plugin.def') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep + 'plugin.def') + plugininstall = [] for targetdir,srcfile in zip(plugtargetlist, pluglist): td, tf = os.path.split(targetdir) -- cgit v1.2.3 From 6613ac0d88a957ce787ad927037c6e7e5700946c Mon Sep 17 00:00:00 2001 From: Stephen Swaney Date: Thu, 1 May 2008 14:22:21 +0000 Subject: Change plugin.def to pluging.DEF for case sensitive operating systems. File is source/blender/blenpluginapi/plugin.DEF --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 65e96e251d5..869ba6454c8 100644 --- a/SConstruct +++ b/SConstruct @@ -415,7 +415,7 @@ pluglist.append('source/blender/blenpluginapi/plugin.h') plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'plugin.h') pluglist.append('source/blender/blenpluginapi/util.h') plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'util.h') -pluglist.append('source/blender/blenpluginapi/plugin.def') +pluglist.append('source/blender/blenpluginapi/plugin.DEF') plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep + 'plugin.def') plugininstall = [] -- cgit v1.2.3