[Bf-blender-cvs] [6eedddc] master: Fix T37780: no languages in user preferences with SCons on Windows / Linux.

Brecht Van Lommel noreply at git.blender.org
Thu Dec 12 06:14:52 CET 2013


Commit: 6eedddc12dc45322773f48ac059e894276ed2bcf
Author: Brecht Van Lommel
Date:   Thu Dec 12 05:56:56 2013 +0100
http://developer.blender.org/rB6eedddc12dc45322773f48ac059e894276ed2bcf

Fix T37780: no languages in user preferences with SCons on Windows / Linux.

The "languages" file was not copied, probably this was not noticed earlier
because it only affects clean builds.

===================================================================

M	SConstruct

===================================================================

diff --git a/SConstruct b/SConstruct
index 3b0bf9c..2e00066 100644
--- a/SConstruct
+++ b/SConstruct
@@ -948,6 +948,7 @@ if env['OURPLATFORM']!='darwin':
 
         po_dir = os.path.join("release", "datafiles", "locale", "po")
 
+        # font files
         for intpath in internationalpaths:
             for dp, dn, df in os.walk(intpath):
                 if '.git' in df:
@@ -968,6 +969,7 @@ if env['OURPLATFORM']!='darwin':
                     env.Execute(Mkdir(dir))
                 scriptinstall.append(env.Install(dir=dir,source=source))
 
+        # .mo files
         for f in os.listdir(po_dir):
             if not f.endswith(".po"):
                 continue
@@ -980,6 +982,12 @@ if env['OURPLATFORM']!='darwin':
             dir = os.path.join(dir, "datafiles", "locale", locale_name, "LC_MESSAGES")
             scriptinstall.append(env.InstallAs(os.path.join(dir, "blender.mo"), mo_file))
 
+        # languages file
+        dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
+        dir = os.path.join(dir, "datafiles", "locale")
+        languages_file = os.path.join("release", "datafiles", "locale", "languages")
+        scriptinstall.append(env.InstallAs(os.path.join(dir, "languages"), languages_file))
+
 #-- icons
 if env['OURPLATFORM']=='linux':
     iconlist = []




More information about the Bf-blender-cvs mailing list