diff options
| -rw-r--r-- | SConstruct | 52 | ||||
| -rw-r--r-- | build_files/scons/tools/Blender.py | 4 | ||||
| -rwxr-xr-x | po/update_mo.py | 2 | ||||
| -rw-r--r-- | release/datafiles/fonts/droidsans.ttf.gz (renamed from release/bin/.blender/fonts/droidsans.ttf.gz) | bin | 2263650 -> 2263650 bytes | |||
| -rw-r--r-- | source/creator/CMakeLists.txt | 12 |
5 files changed, 49 insertions, 21 deletions
diff --git a/SConstruct b/SConstruct index 738466d389e..034f7cf71e5 100644 --- a/SConstruct +++ b/SConstruct @@ -521,19 +521,19 @@ if env['OURPLATFORM']!='darwin': if not env['WITH_BF_INTERNATIONAL']: if 'locale' in dp: continue - if not env['WITH_BF_FREETYPE']: - if f.endswith('.ttf'): - 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) + #~ 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): @@ -563,6 +563,34 @@ if env['OURPLATFORM']!='darwin': 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'] + + 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)) #-- icons if env['OURPLATFORM']=='linux': diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index c802eee4fb6..875d8f7388b 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -561,9 +561,9 @@ def AppIt(target=None, source=None, env=None): if binary == 'blender': cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/datafiles'%(installdir, binary, VERSION) commands.getoutput(cmd) - cmd = 'cp -R %s/release/bin/.blender/locale %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION) + cmd = 'cp -R %s/release/datafiles/locale %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION) commands.getoutput(cmd) - cmd = 'cp -R %s/release/bin/.blender/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION) + cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION) commands.getoutput(cmd) cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION) commands.getoutput(cmd) diff --git a/po/update_mo.py b/po/update_mo.py index 33b7baaed69..a0173b2d059 100755 --- a/po/update_mo.py +++ b/po/update_mo.py @@ -30,7 +30,7 @@ import sys GETTEXT_MSGFMT_EXECUTABLE = "msgfmt" CURRENT_DIR = os.path.abspath(os.path.dirname(__file__)) SOURCE_DIR = os.path.normpath(os.path.abspath(os.path.join(CURRENT_DIR, ".."))) -LOCALE_DIR = os.path.join(SOURCE_DIR, "release", "bin", ".blender", "locale") +LOCALE_DIR = os.path.join(SOURCE_DIR, "release", "datafiles", "locale") DOMAIN = "blender" diff --git a/release/bin/.blender/fonts/droidsans.ttf.gz b/release/datafiles/fonts/droidsans.ttf.gz Binary files differindex a00f35f3a66..a00f35f3a66 100644 --- a/release/bin/.blender/fonts/droidsans.ttf.gz +++ b/release/datafiles/fonts/droidsans.ttf.gz diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index b4e9d4d262e..85facb55a9c 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -352,8 +352,8 @@ if(UNIX AND NOT APPLE) if(WITH_INTERNATIONAL) install( DIRECTORY - ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale - ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts + ${CMAKE_SOURCE_DIR}/release/datafiles/locale + ${CMAKE_SOURCE_DIR}/release/datafiles/fonts DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) @@ -424,8 +424,8 @@ elseif(WIN32) if(WITH_INTERNATIONAL) # same as linux!, deduplicate install( DIRECTORY - ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale - ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts + ${CMAKE_SOURCE_DIR}/release/datafiles/locale + ${CMAKE_SOURCE_DIR}/release/datafiles/fonts DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) @@ -648,8 +648,8 @@ elseif(APPLE) if(WITH_INTERNATIONAL) install( DIRECTORY - ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale - ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts + ${CMAKE_SOURCE_DIR}/release/datafiles/locale + ${CMAKE_SOURCE_DIR}/release/datafiles/fonts DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) |