Merge lp:~gz/bzr/install_mo_command_941835 into lp:bzr/2.5

[Martin Packman]

Adds an install_mo distutils command, and removes the current setup.py hacks related to .mo files. At the moment, .mo files will only be installed if they were built in a previous run of the script, because the code to locate them runs when setup.py loads, rather than after build_mo completes.

In addition, the bzr_distutils module is moved to tools/ as it's only needed during the setup process and isn't used by bzrlib otherwise. The idea presumably was so qbzr could share the code for it's setup.py (as it's the origin), but that's yet to happen and likely needs some more thought before it does.

The default install location is left as "share/locale" for now, but that could be changed (perhaps to something platform specific) as needed.

[lp:~gz/bzr/install_mo_command_941835]

6497. By Martin Packman on 2012-03-27

Reinstate line needed for windows installers

[Jelmer Vernooij (jelmer)]

review: Approve

[Martin Packman (gz)]

This doesn't seem sufficient to get the .mo files somewhere usable. An added complication is that if the translations should be included with the python-based installers, they probably need a different mechanism from the all-in-one installer.

...buildout makes me cry.

[Martin Packman (gz)]

I need to revisit this when I have time to futz with installers.

Unmerged revisions

6497. By Martin Packman on 2012-03-27

Reinstate line needed for windows installers

6496. By Martin Packman on 2012-03-27

Move distutils commands module to tools/ from bzrlib/

6495. By Martin Packman on 2012-03-27

Add install_mo distutils command so setup works when .mo files don't exist yes

=== modified file 'setup.py'
--- setup.py	2012-02-29 12:35:23 +0000
+++ setup.py	2012-03-27 21:04:19 +0000
@@ -73,11 +73,6 @@
                                         'tests/ssl_certs/server.crt',
                                        ]},
            }
-I18N_FILES = []
-for filepath in glob.glob("bzrlib/locale/*/LC_MESSAGES/*.mo"):
-    langfile = filepath[len("bzrlib/locale/"):]
-    targetpath = os.path.dirname(os.path.join("share/locale", langfile))
-    I18N_FILES.append((targetpath, [filepath]))
 
 def get_bzrlib_packages():
     """Recurse through the bzrlib directory, and extract the package names"""
@@ -105,6 +100,7 @@
 
 from distutils import log
 from distutils.core import setup
+from distutils.command.install import install
 from distutils.command.install_scripts import install_scripts
 from distutils.command.install_data import install_data
 from distutils.command.build import build
@@ -157,10 +153,6 @@
     Generate bzr.1.
     """
 
-    sub_commands = build.sub_commands + [
-            ('build_mo', lambda _: True),
-            ]
-
     def run(self):
         build.run(self)
 
@@ -168,15 +160,21 @@
         generate_docs.main(argv=["bzr", "man"])
 
 
+# Add the .mo related subcommands before the *_scripts commands
+bzr_build.sub_commands.insert(3, ('build_mo', lambda _: True))
+install.sub_commands.insert(2, ('install_mo', lambda _: True))
+
+
 ########################
 ## Setup
 ########################
 
-from bzrlib.bzr_distutils import build_mo
+from tools.bzr_distutils import build_mo, install_mo
 
 command_classes = {'install_scripts': my_install_scripts,
                    'build': bzr_build,
                    'build_mo': build_mo,
+                   'install_mo': install_mo,
                    }
 from distutils import log
 from distutils.errors import CCompilerError, DistutilsPlatformError
@@ -522,7 +520,6 @@
 
     ARGS.update(META_INFO)
     ARGS.update(BZRLIB)
-    PKG_DATA['package_data']['bzrlib'].append('locale/*/LC_MESSAGES/*.mo')
     ARGS.update(PKG_DATA)
 
     setup(**ARGS)
@@ -677,7 +674,7 @@
                        'tools/win32/bzr_postinstall.py',
                        ]
     gui_targets = [gui_target]
-    data_files = topics_files + plugins_files + I18N_FILES
+    data_files = topics_files + plugins_files
 
     if 'qbzr' in plugins:
         get_qbzr_py2exe_info(includes, excludes, packages, data_files)
@@ -764,7 +761,6 @@
         # easy_install one
         DATA_FILES = [('man/man1', ['bzr.1'])]
 
-    DATA_FILES = DATA_FILES + I18N_FILES
     # std setup
     ARGS = {'scripts': ['bzr'],
             'data_files': DATA_FILES,

=== renamed file 'bzrlib/bzr_distutils.py' => 'tools/bzr_distutils.py'
--- bzrlib/bzr_distutils.py	2011-12-19 13:23:58 +0000
+++ tools/bzr_distutils.py	2012-03-27 21:04:19 +0000
@@ -116,3 +116,49 @@
                 self.spawn(['msgfmt', '-o', mo, po])
 
 
+class install_mo(Command):
+
+    description = "install mo files"
+
+    user_options = [
+        ('install-dir=', 'd', "directory to install mo files to"),
+        ('build-dir=','b', "build directory (where to install from)"),
+        ('force', 'f', "force installation (overwrite existing files)"),
+        ('skip-build', None, "skip the build steps"),
+        ]
+
+    boolean_options = ['force', 'skip-build']
+
+    def initialize_options(self):
+        self.install_data = None
+        self.install_dir = None
+        self.build_dir = None
+        self.force = False
+        self.skip_build = False
+
+    def finalize_options(self):
+        self.set_undefined_options('install',
+            ('install_data', 'install_data'),
+            ('force', 'force'),
+            ('skip_build', 'skip_build'),
+            )
+        self.set_undefined_options('build_mo',
+            ('build_dir', 'build_dir'),
+            )
+        if self.install_dir is None:
+            # TODO: platform specific tweaks
+            self.install_dir = os.path.join(self.install_data, "share/locale")
+
+    def run(self):
+        self.build()
+        self.install()
+
+    def build(self):
+        if not self.skip_build:
+            self.run_command('build_mo')
+
+    def install(self):
+        if os.path.isdir(self.build_dir):
+            return self.copy_tree(self.build_dir, self.install_dir)
+        self.warn("'%s' does not exist -- no .mo files to install" %
+                  self.build_dir)