821845 - desktop b2g multilocale changes

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Aki Sasaki (not active)]

* merge-%s target needs to have compare-locales in path
* no need to run compare-locales outside the merge-%s target

Comment 1

[Aki Sasaki (not active)]

merge-%:
ifdef LOCALE_MERGEDIR
        $(RM) -rf $(LOCALE_MERGEDIR)
        MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
endif
        @echo

Comment 2

[Aki Sasaki (not active)]

Attachment: this will probably fix it

Comment 3

[Aki Sasaki (not active)]

Axel, I made the changes requested, and am now getting:

17:39:37     INFO - Running command: make merge-es-ES L10NBASEDIR=/builds/slave/m-b2g18-linux32-g/./gecko-l10n LOCALE_MERGEDIR=/builds/slave/m-b2g18-linux32-g/./build/obj-firefox/merged in /builds/slave/m-b2g18-linux32-g/./build/obj-firefox/b2g/locales
17:39:37     INFO -  rm -f -rf /builds/slave/m-b2g18-linux32-g/./build/obj-firefox/merged
17:39:37     INFO -  MACOSX_DEPLOYMENT_TARGET= compare-locales -m /builds/slave/m-b2g18-linux32-g/./build/obj-firefox/merged /builds/slave/m-b2g18-linux32-g/build/b2g/locales/l10n.ini /builds/slave/m-b2g18-linux32-g/./gecko-l10n es-ES
17:39:37    ERROR -  Traceback (most recent call last):
17:39:37     INFO -    File "/builds/slave/m-b2g18-linux32-g/./compare-locales/scripts/compare-locales", line 44, in <module>
17:39:37     INFO -      from Mozilla.Paths import EnumerateApp
17:39:37     INFO -  ImportError: No module named Mozilla.Paths
17:39:37     INFO -  make: *** [merge-es-ES] Error 1
17:39:37    ERROR - Return code: 2

Comment 4

[Aki Sasaki (not active)]

ah, that's probably what this is for

        env = self.query_env(partial_env={'PYTHONPATH':
                             os.path.join(dirs['abs_compare_locales_dir'],
                                          'lib')})

Comment 5

[Axel Hecht [:Pike]]

yep

Comment 6

[Aki Sasaki (not active)]

Attachment: get compare-locales working inside merge-%s

Tested on a b2g linux nightly in staging.
http://dev-master01.build.mozilla.org:8052/builders/b2g_mozilla-b2g18_linux32_gecko%20nightly/builds/0/steps/mozharness_multilocale/logs/stdio

Comment 7

[Aki Sasaki (not active)]

Comment on attachment 692475 [details] [diff] [review]
get compare-locales working inside merge-%s

http://hg.mozilla.org/build/mozharness/rev/bb67ba1f1092