diff options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 138 |
1 files changed, 54 insertions, 84 deletions
diff --git a/SConstruct b/SConstruct index 034f7cf71e5..606cc33fb20 100644 --- a/SConstruct +++ b/SConstruct @@ -505,92 +505,62 @@ dottargetlist = [] scriptinstall = [] if env['OURPLATFORM']!='darwin': - for dp, dn, df in os.walk('release/bin/.blender'): - dp = os.path.normpath(dp) - - if '.svn' in dn: - dn.remove('.svn') - if '_svn' in dn: - dn.remove('_svn') - - for f in df: - # This files aren't used anymore - if f in (".bfont.ttf", ): - continue - - if not env['WITH_BF_INTERNATIONAL']: - if 'locale' in dp: - continue - #~ if not env['WITH_BF_FREETYPE']: - #~ if f.endswith('.ttf'): - #~ continue - - #~ if 'locale' in dp or 'fonts' in dp: - #~ datafileslist.append(os.path.join(dp,f)) - #~ dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['datafiles'] + dp.split(os.sep)[3:])) # skip bin - #~ datafilestargetlist.append(dir + os.sep + f) - - #~ else: - #~ dotblendlist.append(os.path.join(dp, f)) - #~ dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['config'] + dp.split(os.sep)[3:])) # skip bin - #~ dottargetlist.append(dir + os.sep + f) - - dotblenderinstall = [] - for targetdir,srcfile in zip(dottargetlist, dotblendlist): - td, tf = os.path.split(targetdir) - dotblenderinstall.append(env.Install(dir=td, source=srcfile)) - for targetdir,srcfile in zip(datafilestargetlist, datafileslist): - td, tf = os.path.split(targetdir) - dotblenderinstall.append(env.Install(dir=td, source=srcfile)) + dotblenderinstall = [] + for targetdir,srcfile in zip(dottargetlist, dotblendlist): + td, tf = os.path.split(targetdir) + dotblenderinstall.append(env.Install(dir=td, source=srcfile)) + for targetdir,srcfile in zip(datafilestargetlist, datafileslist): + td, tf = os.path.split(targetdir) + dotblenderinstall.append(env.Install(dir=td, source=srcfile)) + + if env['WITH_BF_PYTHON']: + #-- local/VERSION/scripts + scriptpaths=['release/scripts'] + for scriptpath in scriptpaths: + for dp, dn, df in os.walk(scriptpath): + if '.svn' in dn: + dn.remove('.svn') + if '_svn' in dn: + dn.remove('_svn') + if '__pycache__' in dn: # py3.2 cache dir + dn.remove('__pycache__') + + dir = os.path.join(env['BF_INSTALLDIR'], VERSION) + dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):] + + source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")] + # To ensure empty dirs are created too + if len(source)==0: + env.Execute(Mkdir(dir)) + scriptinstall.append(env.Install(dir=dir,source=source)) + + if env['WITH_BF_INTERNATIONAL']: + internationalpaths=['release' + os.sep + 'datafiles'] - if env['WITH_BF_PYTHON']: - #-- local/VERSION/scripts - scriptpaths=['release/scripts'] - for scriptpath in scriptpaths: - for dp, dn, df in os.walk(scriptpath): - if '.svn' in dn: - dn.remove('.svn') - if '_svn' in dn: - dn.remove('_svn') - if '__pycache__' in dn: # py3.2 cache dir - dn.remove('__pycache__') - - dir = os.path.join(env['BF_INSTALLDIR'], VERSION) - dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):] - - source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")] - # To ensure empty dirs are created too - if len(source)==0: - env.Execute(Mkdir(dir)) - scriptinstall.append(env.Install(dir=dir,source=source)) + def check_path(path, member): + return (member in path.split(os.sep)) - if env['WITH_BF_INTERNATIONAL']: - internationalpaths=['release' + os.sep + 'datafiles'] - - def check_path(path, member): - return (member in path.split(os.sep)) - - for intpath in internationalpaths: - for dp, dn, df in os.walk(intpath): - if '.svn' in dn: - dn.remove('.svn') - if '_svn' in dn: - dn.remove('_svn') - - # we only care about release/datafiles/fonts, release/datafiles/locales - if check_path(dp, "fonts") or check_path(dp, "locale"): - pass - else: - continue - - dir = os.path.join(env['BF_INSTALLDIR'], VERSION) - dir += os.sep + os.path.basename(intpath) + dp[len(intpath):] - - source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")] - # To ensure empty dirs are created too - if len(source)==0: - env.Execute(Mkdir(dir)) - scriptinstall.append(env.Install(dir=dir,source=source)) + for intpath in internationalpaths: + for dp, dn, df in os.walk(intpath): + if '.svn' in dn: + dn.remove('.svn') + if '_svn' in dn: + dn.remove('_svn') + + # we only care about release/datafiles/fonts, release/datafiles/locales + if check_path(dp, "fonts") or check_path(dp, "locale"): + pass + else: + continue + + dir = os.path.join(env['BF_INSTALLDIR'], VERSION) + dir += os.sep + os.path.basename(intpath) + dp[len(intpath):] + + source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")] + # To ensure empty dirs are created too + if len(source)==0: + env.Execute(Mkdir(dir)) + scriptinstall.append(env.Install(dir=dir,source=source)) #-- icons if env['OURPLATFORM']=='linux': |