move fonts/ and locale/ dirs into release/datafiles, since blender wasn't finding them in their current location and so to test international characters you had to 'make install'.

updated scons/cmake/translation-scripts.

1 files changed, 40 insertions, 12 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':