Merge lp://staging/~gz/bzr/inplace_mo_ignored_955314 into lp://staging/bzr/2.5
Proposed by
Martin Packman
Status: | Work in progress |
---|---|
Proposed branch: | lp://staging/~gz/bzr/inplace_mo_ignored_955314 |
Merge into: | lp://staging/bzr/2.5 |
Prerequisite: | lp://staging/~gz/bzr/install_mo_command_941835 |
Diff against target: |
57 lines (+17/-3) 2 files modified
.bzrignore (+2/-0) tools/bzr_distutils.py (+15/-3) |
To merge this branch: | bzr merge lp://staging/~gz/bzr/inplace_mo_ignored_955314 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij (community) | Approve | ||
Review via email: mp+99523@code.staging.launchpad.net |
Description of the change
Moves the default location for building .mo files into the build/ directory, and adds an --inplace option for the current behaviour when testing in a workingtree is useful. Also adds the local locale dir containing translations to ignores for those cases.
To do testing of translations without installing, the steps now look like:
$ make update-pot
$ ./setup.py build_mo -i
$ LANG=ja_JP ./bzr help branch
To post a comment you must log in.
Unmerged revisions
- 6498. By Martin Packman
-
Ignore ./bzrlib/locale
- 6497. By Martin Packman
-
Put .mo files under build/ during setup unless --inplace is given
- 6496. By Martin Packman
-
Move distutils commands module to tools/ from bzrlib/
- 6495. By Martin Packman
-
Add install_mo distutils command so setup works when .mo files don't exist yes
When trying to build the windows installers, the .mo files seemed to end up in a different lib directory from the other bzrlib stuff. That might be the fault of this change or the weird things the installer build script does.