Merge lp:~kissiel/checkbox/migrate-from-make into lp:checkbox

[Maciej Kisielewski]

This MR adds Checkbox-Converged i18n-related task to build-me.

Main rationale behind it is lack makes inability to handle colons in filenames, and we use (and even require colons to be present in the provider name, which is usually used as the directory name for that provider. In turn those provider are then searched for translatable strings - making Make fail.

e3f8da1 converged:utils: add poor man's find
afe9242 converged: add building of .mo files to build-me
eece2fa converged: add --update-potfile to build-me
d9c42f7 converged: add deprecation warning to i18n-related task in makefile

[Sylvain Pineau (sylvain-pineau)]

just one typo, otherwise +1

review: Needs Fixing

[Maciej Kisielewski (kissiel)]

> just one typo, otherwise +1

Fixed, rebased, repushed.

self-landing

[Sylvain Pineau (sylvain-pineau)]

Attempt to merge into lp:checkbox failed due to conflicts:

duplicate in plainbox/plainbox/impl/providers/exporters/data/global.txt.moved

[lp:~kissiel/checkbox/migrate-from-make]

4425. By Launchpad Translations on behalf of checkbox-dev on 2016-07-09

Launchpad automatic translations update.

4426. By Maciej Kisielewski on 2016-07-11

converged:utils: add poor man's find

Signed-off-by: Maciej Kisielewski <email address hidden>

4427. By Maciej Kisielewski on 2016-07-11

converged: add building of .mo files to build-me

Signed-off-by: Maciej Kisielewski <email address hidden>

4428. By Maciej Kisielewski on 2016-07-11

converged: add --update-potfile to build-me

Signed-off-by: Maciej Kisielewski <email address hidden>

4429. By Maciej Kisielewski on 2016-07-11

converged: add deprecation warning to i18n-related task in makefile

Signed-off-by: Maciej Kisielewski <email address hidden>

[Maciej Kisielewski (kissiel)]

> Attempt to merge into lp:checkbox failed due to conflicts:
>
> duplicate in plainbox/plainbox/impl/providers/exporters/data/global.txt.moved

Weird. Rebased on current trunk.
Trying to land...

=== modified file 'checkbox-touch/Makefile'
--- checkbox-touch/Makefile	2016-07-01 10:05:57 +0000
+++ checkbox-touch/Makefile	2016-07-11 06:51:05 +0000
@@ -40,12 +40,20 @@
 	/usr/bin/qmlscene $@ checkbox-touch.qml
 
 build-translations: $(MO_FILES)
-	echo $(MO_FILES)
+	@echo "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@echo "Use of this Makefile for i18n tasks is deprecated"
+	@echo "./build-me will build translations for you automatically"
+	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
+	@echo $(MO_FILES)
 
 po:
 	mkdir -p $(CURDIR)/po
 
 po/checkbox-touch.pot: $(QMLJS_FILES) $(PY_FILES) | po
+	@echo "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@echo "Use of this Makefile for i18n tasks is deprecated"
+	@echo "Use ./build-me --update-potfile instead"
+	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
 	xgettext -o po/checkbox-touch.pot --qt --c++ --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 $(QMLJS_FILES) --from-code=UTF-8
 	xgettext -o po/checkbox-touch.pot --join-existing --language=python --add-comments=TRANSLATORS --keyword=_ --keyword=N_ $(PY_FILES)
 
 
=== modified file 'checkbox-touch/build-me'
--- checkbox-touch/build-me	2016-06-15 22:31:58 +0000
+++ checkbox-touch/build-me	2016-07-11 06:51:05 +0000
@@ -16,6 +16,7 @@
 from utils import get_package_from_url_and_extract
 from utils import prepare_uris
 from utils import rsync_tree
+from utils import find
 
 from confinement.generate import generate_confinement
 sys.path.append('./py')
@@ -143,7 +144,12 @@
     parser.add_argument("--forced-resume", action='store_true',
                         help=("Force checkbox to always resume session (and "
                               "rerun the last test)."))
+    parser.add_argument("--update-potfile", action='store_true',
+                        help=("Updates the potfile and quits"))
     args = parser.parse_args()
+    if args.update_potfile:
+        update_pot()
+        return
     if args.port and not args.ssh:
         parser.error("--port without --ssh doesn't make sense!")
         return 1
@@ -278,10 +284,37 @@
             if os.path.exists(catalog):
                 _update_catalogs(os.path.join('po', lang + '.po'), catalog)
     # build .mo files
+    for po in find(top='./po', include=['*.po']):
+        lang = os.path.splitext(os.path.basename(po))[0]
+        target_dir = 'share/locale/{}/LC_MESSAGES/'.format(lang)
+        target_file = os.path.join(target_dir, 'com.ubuntu.checkbox.mo')
+        if not os.path.exists(target_dir):
+            os.makedirs(target_dir)
+        try:
+            subprocess.check_output(['msgfmt', '-o', target_file, po])
+        except subprocess.CalledProcessError as exc:
+            sys.exit('Error encountered while creating %s translations. %s' % (
+                target_file, exc))
+
+
+def update_pot():
+    potfile = 'po/checkbox-touch.pot'
+    print("Updating {}".format(potfile))
+    py_files = find(top='./py', include=['*.py'])
+    py_files += ['build-me', 'get-libs']
+    qmljs_files = find(include=['*.qml', '*.js'], exclude=['./tests/*'])
     try:
-        subprocess.check_output(['make', 'build-translations'])
+        subprocess.check_output(
+            ['xgettext', '-o', potfile, '--qt', '--c++',
+             '--add-comments=TRANSLATORS', '--keyword=tr', '--keyword=tr:1,2',
+             '--from-code=UTF-8'] + qmljs_files)
+        subprocess.check_output(
+            ['xgettext', '-o', potfile, '--join-existing',
+             '--add-comments=TRANSLATORS', '--language=python', '--keyword=_',
+             '--keyword=N_'] + py_files)
     except subprocess.CalledProcessError as exc:
-        sys.exit('Error encountered while building translations. %s' % exc)
+        sys.exit('Error encountered while updating po/checkbox-touch.pot %s' %
+                 exc)
 
 
 def _update_catalogs(dest, src):
 
=== modified file 'checkbox-touch/utils.py'
--- checkbox-touch/utils.py	2016-05-31 09:13:09 +0000
+++ checkbox-touch/utils.py	2016-07-11 06:51:05 +0000
@@ -24,6 +24,7 @@
 import apt_pkg
 import collections
 import contextlib
+from fnmatch import fnmatch
 import os
 import shutil
 import subprocess
@@ -97,3 +98,14 @@
         yield
         shutil.rmtree(path)
         shutil.copytree(target, path)
+
+
+def find(top='.', include=['*'], exclude=[]):
+    """Poor man's python simplified imitation of GNU find."""
+    results = []
+    for dirpath, dirnames, filenames in os.walk(top):
+        for f in [os.path.join(dirpath, f) for f in filenames]:
+            if (any(fnmatch(f, i) for i in include) and
+                    not any(fnmatch(f, e) for e in exclude)):
+                results.append(f)
+    return results