[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40406] trunk/blender: - translation scripts now run with py3.x
Campbell Barton
ideasman42 at gmail.com
Tue Sep 20 19:07:33 CEST 2011
Revision: 40406
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40406
Author: campbellbarton
Date: 2011-09-20 17:07:33 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
- translation scripts now run with py3.x
- added convenience make target 'make translations'
- some MEM_malloc strings were not unique enough, expanded them.
Modified Paths:
--------------
trunk/blender/GNUmakefile
trunk/blender/po/update_mo.py
trunk/blender/po/update_po.py
trunk/blender/po/update_pot.py
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/python/intern/bpy_interface_atexit.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile 2011-09-20 17:06:17 UTC (rev 40405)
+++ trunk/blender/GNUmakefile 2011-09-20 17:07:33 UTC (rev 40406)
@@ -130,6 +130,10 @@
@echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
+ @echo "Other Targets"
+ @echo " * translations - update blenders translation files in po/"
+ # TODO, doxygen and sphinx docs
+ @echo ""
@echo "Testing Targets (not assosiated with building blender)"
@echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
@echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
@@ -157,6 +161,15 @@
# -----------------------------------------------------------------------------
+# Other Targets
+#
+translations:
+ python3 po/update_pot.py
+ python3 po/update_po.py
+ python3 po/update_mo.py
+
+
+# -----------------------------------------------------------------------------
# Tests
#
test:
Modified: trunk/blender/po/update_mo.py
===================================================================
--- trunk/blender/po/update_mo.py 2011-09-20 17:06:17 UTC (rev 40405)
+++ trunk/blender/po/update_mo.py 2011-09-20 17:07:33 UTC (rev 40406)
@@ -1,17 +1,53 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+# $Id:
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+# <pep8 compliant>
+
# update all mo files in the LANGS
+import subprocess
import os
-LOCALE_DIR="../release/bin/.blender/locale"
-PO_DIR = "."
+CURRENT_DIR = 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")
+
DOMAIN = "blender"
-for po in os.listdir( PO_DIR ):
- if po.endswith(".po"):
- lang = po[:-3]
- # show stats
- cmd = "msgfmt --statistics %s.po -o %s/%s/LC_MESSAGES/%s.mo" % ( lang, LOCALE_DIR, lang, DOMAIN )
- print cmd
- os.system( cmd )
+
+def main():
+ for po in os.listdir(CURRENT_DIR):
+ if po.endswith(".po"):
+ lang = po[:-3]
+ # show stats
+ cmd = ("msgfmt",
+ "--statistics",
+ os.path.join(CURRENT_DIR, "%s.po" % lang),
+ "-o",
+ os.path.join(LOCALE_DIR, lang, "LC_MESSAGES", "%s.mo" % DOMAIN),
+ )
+
+ print(" ".join(cmd))
+ process = subprocess.Popen(cmd)
+ process.wait()
+
+if __name__ == "__main__":
+ main()
Modified: trunk/blender/po/update_po.py
===================================================================
--- trunk/blender/po/update_po.py 2011-09-20 17:06:17 UTC (rev 40405)
+++ trunk/blender/po/update_po.py 2011-09-20 17:07:33 UTC (rev 40406)
@@ -1,17 +1,52 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+# $Id:
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+# <pep8 compliant>
+
# update all po files in the LANGS
+import subprocess
import os
-PO_DIR = "."
+CURRENT_DIR = os.path.dirname(__file__)
DOMAIN = "blender"
-for po in os.listdir( PO_DIR ):
- if po.endswith(".po"):
- lang = po[:-3]
- # update po file
- cmd = "msgmerge --update --lang=%s %s.po %s.pot" % (lang, lang, DOMAIN)
- print(cmd)
- os.system( cmd )
-
+
+def main():
+ for po in os.listdir(CURRENT_DIR):
+ if po.endswith(".po"):
+ lang = po[:-3]
+
+ # update po file
+ cmd = ("msgmerge",
+ "--update",
+ "--lang=%s" % lang,
+ os.path.join(CURRENT_DIR, "%s.po" % lang),
+ os.path.join(CURRENT_DIR, "%s.pot" % DOMAIN),
+ )
+
+ print(" ".join(cmd))
+ process = subprocess.Popen(cmd)
+ process.wait()
+
+
+if __name__ == "__main__":
+ main()
Modified: trunk/blender/po/update_pot.py
===================================================================
--- trunk/blender/po/update_pot.py 2011-09-20 17:06:17 UTC (rev 40405)
+++ trunk/blender/po/update_pot.py 2011-09-20 17:07:33 UTC (rev 40406)
@@ -1,50 +1,61 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+# $Id:
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+# <pep8 compliant>
+
# update the pot file according the POTFILES.in
+import subprocess
import os
-GETTEXT_XGETTEXT_EXECUTABLE="xgettext"
-SOURCE_DIR=".."
-DOMAIN="blender"
+GETTEXT_XGETTEXT_EXECUTABLE = "xgettext"
+CURRENT_DIR = os.path.dirname(__file__)
+SOURCE_DIR = os.path.normpath(os.path.abspath(os.path.join(CURRENT_DIR, "..")))
+DOMAIN = "blender"
-cmd = "%s --files-from=%s/po/POTFILES.in --keyword=_ --keyword=N_ --directory=%s --output=%s/po/%s.pot --from-code=utf-8" % (
- GETTEXT_XGETTEXT_EXECUTABLE, SOURCE_DIR, SOURCE_DIR, SOURCE_DIR, DOMAIN)
+FILE_NAME_POT = os.path.join(CURRENT_DIR, "blender.pot")
+FILE_NAME_MESSAGES = os.path.join(CURRENT_DIR, "messages.txt")
-os.system( cmd )
-def stripeol(s):
- if line.endswith("\n"):
- s = s[:-1]
+def main():
+ cmd = (GETTEXT_XGETTEXT_EXECUTABLE,
+ "--files-from=%s" % os.path.join(SOURCE_DIR, "po", "POTFILES.in"),
+ "--keyword=_",
+ "--keyword=N_",
+ "--directory=%s" % SOURCE_DIR,
+ "--output=%s" % os.path.join(SOURCE_DIR, "po", "%s.pot" % DOMAIN),
+ "--from-code=utf-8",
+ )
- if line.endswith("\r"):
- s = s[:-1]
+ print(" ".join(cmd))
+ process = subprocess.Popen(cmd)
+ process.wait()
- return s
+ def stripeol(s):
+ return s.rstrip("\n\r")
-pot_messages = {}
-reading_message = False
-message = ""
-with open("blender.pot", 'r') as handle:
- while True:
- line = handle.readline()
-
- if not line:
- break
-
- line = stripeol(line)
- if line.startswith("msgid"):
- reading_message = True
- message = line[7:-1]
- elif line.startswith("msgstr"):
- reading_message = False
- pot_messages[message] = True
- elif reading_message:
- message += line[1:-1]
-
-# add messages collected automatically from RNA
-with open("blender.pot", "a") as pot_handle:
- with open("messages.txt", 'r') as handle:
+ pot_messages = {}
+ reading_message = False
+ message = ""
+ with open(FILE_NAME_POT, 'r') as handle:
while True:
line = handle.readline()
@@ -52,10 +63,33 @@
break
line = stripeol(line)
- line = line.replace("\\", "\\\\")
- line = line.replace("\"", "\\\"")
+ if line.startswith("msgid"):
+ reading_message = True
+ message = line[7:-1]
+ elif line.startswith("msgstr"):
+ reading_message = False
+ pot_messages[message] = True
+ elif reading_message:
+ message += line[1:-1]
- if not pot_messages.get(line):
- pot_handle.write("\n#: Automatically collected from RNA\n")
- pot_handle.write("msgid \"%s\"\n" % (line))
- pot_handle.write("msgstr \"\"\n")
+ # add messages collected automatically from RNA
+ with open(FILE_NAME_POT, "a") as pot_handle:
+ with open(FILE_NAME_MESSAGES, 'r') as handle:
+ while True:
+ line = handle.readline()
+
+ if not line:
+ break
+
+ line = stripeol(line)
+ line = line.replace("\\", "\\\\")
+ line = line.replace("\"", "\\\"")
+
+ if not pot_messages.get(line):
+ pot_handle.write("\n#: Automatically collected from RNA\n")
+ pot_handle.write("msgid \"%s\"\n" % (line))
+ pot_handle.write("msgstr \"\"\n")
+
+
+if __name__ == "__main__":
+ main()
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-09-20 17:06:17 UTC (rev 40405)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list