move fonts/ and locale/ dirs into release/datafiles, since blender wasn't finding...
authorCampbell Barton <ideasman42@gmail.com>
Fri, 21 Oct 2011 03:00:28 +0000 (03:00 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 21 Oct 2011 03:00:28 +0000 (03:00 +0000)
updated scons/cmake/translation-scripts.

SConstruct
build_files/scons/tools/Blender.py
po/update_mo.py
release/datafiles/fonts/droidsans.ttf.gz [moved from release/bin/.blender/fonts/droidsans.ttf.gz with 100% similarity]
source/creator/CMakeLists.txt

index 738466d..034f7cf 100644 (file)
@@ -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':
index c802eee..875d8f7 100644 (file)
@@ -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)
index 33b7baa..a0173b2 100755 (executable)
@@ -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"
 
index b4e9d4d..85facb5 100644 (file)
@@ -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
                )