kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Remove check for whether po folder exist

Browse Source 
It was just a temp thing to not break stuff
before final git migration.
This commit is contained in:
Sergey Sharybin 2013-11-17 00:09:03 +06:00
parent 09ecfc318c
commit 9c3586d9f9
2 changed files with 36 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SConstruct
View File

@ -943,7 +943,6 @@ if env['OURPLATFORM']!='darwin':
return (member in path.split(os.sep)) return (member in path.split(os.sep))
po_dir = os.path.join("release", "datafiles", "locale", "po") po_dir = os.path.join("release", "datafiles", "locale", "po")
need_compile_mo = os.path.exists(po_dir)
for intpath in internationalpaths: for intpath in internationalpaths:
for dp, dn, df in os.walk(intpath): for dp, dn, df in os.walk(intpath):
@ -953,10 +952,7 @@ if env['OURPLATFORM']!='darwin':
dn.remove('_svn') dn.remove('_svn')
# we only care about release/datafiles/fonts, release/datafiles/locales # we only care about release/datafiles/fonts, release/datafiles/locales
if check_path(dp, "locale"): if check_path(dp, "fonts"):
if need_compile_mo and check_path(dp, "po"):
continue
elif check_path(dp, "fonts"):
pass pass
else: else:
continue continue
@ -970,7 +966,6 @@ if env['OURPLATFORM']!='darwin':
env.Execute(Mkdir(dir)) env.Execute(Mkdir(dir))
scriptinstall.append(env.Install(dir=dir,source=source)) scriptinstall.append(env.Install(dir=dir,source=source))
if need_compile_mo:
for f in os.listdir(po_dir): for f in os.listdir(po_dir):
if not f.endswith(".po"): if not f.endswith(".po"):
continue continue

10
source/creator/CMakeLists.txt
View File

@ -326,8 +326,6 @@ if(WITH_INTERNATIONAL)
) )
set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale") set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
if(EXISTS "${_locale_dir}/po")
set(_locale_target_dir ${TARGETDIR_VER}/datafiles/locale) set(_locale_target_dir ${TARGETDIR_VER}/datafiles/locale)
file(GLOB _po_files "${_locale_dir}/po/*.po") file(GLOB _po_files "${_locale_dir}/po/*.po")
@ -363,14 +361,6 @@ if(WITH_INTERNATIONAL)
unset(_po_file) unset(_po_file)
unset(_mo_file) unset(_mo_file)
unset(_locale_target_dir) unset(_locale_target_dir)
else()
install(
DIRECTORY
${_locale_dir}
DESTINATION ${TARGETDIR_VER}/datafiles
PATTERN ".svn" EXCLUDE
)
endif()
unset(_locale_dir) unset(_locale_dir)
endif() endif()