Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-27082015 into lp:qtcreator-plugin-ubuntu/3.1

[Benjamin Zeller]

- Catch "permission denied" error if opening syslog is not allowed
- Fix Bug lp:1480771 "Wrong directory used for translation"
- Fix Bug lp:1443351 ".desktop file is not translated for qmake based
projects"
- Fix Bug lp:1479581 "Debug helper is disabled by default"
- Fix Bug lp:1481325 "fix i18n integration in qmake template"

- Catch "permission denied" error if opening syslog is not allowed
- Fix Bug lp:1480771 "Wrong directory used for translation"
- Fix Bug lp:1443351 ".desktop file is not translated for qmake based
projects"
- Fix Bug lp:1479581 "Debug helper is disabled by default"
- Fix Bug lp:1481325 "fix i18n integration in qmake template"

[Zoltan Balogh (bzoltan)]

Let's test it

review: Approve

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-27082015]

408. By Benjamin Zeller on 2015-08-27

Add bugs

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.desktop'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.desktop	2015-01-17 04:53:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.desktop	2015-08-27 10:44:50 +0000
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=%ClickHookName%
+_Name=%ClickHookName%
 Exec=qmlscene $@ %ClickHookName%/Main.qml
 Icon=%ClickHookName%/%ClickHookName%.png
 Terminal=false

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.pro'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.pro	2015-05-26 09:46:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.pro	2015-08-27 10:44:50 +0000
@@ -7,7 +7,6 @@
              $$files(*.js,true)
 
 CONF_FILES +=  %ClickHookName%.apparmor \
-               %ClickHookName%.desktop \
                %ClickHookName%.png
 
 AP_TEST_FILES += tests/autopilot/run \
@@ -15,7 +14,8 @@
 
 OTHER_FILES += $${CONF_FILES} \
                $${QML_FILES} \
-               $${AP_TEST_FILES}
+               $${AP_TEST_FILES} \
+               %ClickHookName%.desktop 
 
 #specify where the qml/js files are installed to
 qml_files.path = /%ClickHookName%
@@ -25,4 +25,10 @@
 config_files.path = /%ClickHookName%
 config_files.files += $${CONF_FILES}
 
-INSTALLS+=config_files qml_files
+#install the desktop file, a translated version is automatically created in 
+#the build directory
+desktop_file.path = /%ClickHookName%
+desktop_file.files = $$OUT_PWD/%ClickHookName%.desktop 
+desktop_file.CONFIG += no_check_exist 
+
+INSTALLS+=config_files qml_files desktop_file

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/projectName.pro'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/projectName.pro	2015-05-26 09:46:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/projectName.pro	2015-08-27 10:44:50 +0000
@@ -25,20 +25,21 @@
     $$files(*.qml,true) \
     $$files(*.js,true)  \
     $$files(*.cpp,true) \
-    $$files(*.h,true)
+    $$files(*.h,true) \
+    $$files(*.desktop,true)
 
 # specifies all translations files and makes sure they are
 # compiled and installed into the right place in the click package
 UBUNTU_PO_FILES+=$$files(po/*.po)
 
 aptest.target   = autopilot
-aptest.commands = QML2_IMPORT_PATH=$$OUT_PWD/backend bash $$PWD/app/tests/autopilot/run
-aptest.depends  = sub-app sub-backend-App
+aptest.commands = QML2_IMPORT_PATH=$$OUT_PWD/backend bash $$PWD/%ClickHookName%/tests/autopilot/run
+aptest.depends  = sub-%ClickHookName% sub-backend-App
 
 unittest.target   = check
 unittest.commands = /usr/bin/qmltestrunner -input $$PWD/backend/tests/unit -import $$OUT_PWD/backend
-unittest.commands += && /usr/bin/qmltestrunner -input $$PWD/app/tests/unit -import $$OUT_PWD/backend
-unittest.depends  = sub-app sub-backend-App
+unittest.commands += && /usr/bin/qmltestrunner -input $$PWD/%ClickHookName%/tests/unit -import $$OUT_PWD/backend
+unittest.depends  = sub-%ClickHookName% sub-backend-App
 
 QMAKE_EXTRA_TARGETS += aptest unittest
 

=== modified file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.desktop'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.desktop	2014-11-13 15:45:24 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.desktop	2015-08-27 10:44:50 +0000
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=%ClickHookName%
+_Name=%ClickHookName%
 Exec=%ClickHookName%
 Icon=%ClickHookName%/%ClickHookName%.png
 Terminal=false

=== modified file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.pro'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.pro	2015-05-22 15:37:52 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.pro	2015-08-27 10:44:50 +0000
@@ -13,7 +13,6 @@
              $$files(*.js,true)
 
 CONF_FILES +=  %ClickHookName%.apparmor \
-               %ClickHookName%.desktop \
                %ClickHookName%.png
 
 AP_TEST_FILES += tests/autopilot/run \
@@ -22,13 +21,21 @@
 #show all the files in QtCreator
 OTHER_FILES += $${CONF_FILES} \
                $${QML_FILES} \
-               $${AP_TEST_FILES}
+               $${AP_TEST_FILES} \
+               %ClickHookName%.desktop
 
 #specify where the config files are installed to
 config_files.path = /%ClickHookName%
 config_files.files += $${CONF_FILES}
 INSTALLS+=config_files
 
+#install the desktop file, a translated version is 
+#automatically created in the build directory
+desktop_file.path = /%ClickHookName%
+desktop_file.files = $$OUT_PWD/%ClickHookName%.desktop
+desktop_file.CONFIG += no_check_exist
+INSTALLS+=desktop_file
+
 # Default rules for deployment.
 target.path = $${UBUNTU_CLICK_BINARY_PATH}
 INSTALLS+=target

=== modified file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/projectName.pro'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/projectName.pro	2015-05-26 09:46:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/projectName.pro	2015-08-27 10:44:50 +0000
@@ -21,20 +21,21 @@
 # template is created in po/template.pot, to create a
 # translation copy the template to e.g. de.po and edit the sources
 UBUNTU_TRANSLATION_SOURCES+= \
-    $$files(app/*.qml,true) \
-    $$files(app/*.js,true)
+    $$files(*.qml,true) \
+    $$files(*.js,true) \
+    $$files(*.desktop,true)
 
 # specifies all translations files and makes sure they are
 # compiled and installed into the right place in the click package
 UBUNTU_PO_FILES+=$$files(po/*.po)
 
 aptest.target   = autopilot
-aptest.commands = bash $$PWD/app/tests/autopilot/run
-aptest.depends  = sub-app
+aptest.commands = bash $$PWD/%ClickHookName%/tests/autopilot/run
+aptest.depends  = sub-%ClickHookName%
 
 unittest.target   = check
-unittest.commands = /usr/bin/qmltestrunner -input $$PWD/app/tests/unit
-unittest.depends  = sub-app
+unittest.commands = /usr/bin/qmltestrunner -input $$PWD/%ClickHookName%/tests/unit
+unittest.depends  = sub-%ClickHookName%
 
 QMAKE_EXTRA_TARGETS += aptest unittest
 

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.desktop'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.desktop	2015-01-17 04:53:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.desktop	2015-08-27 10:44:50 +0000
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=%ClickHookName%
+_Name=%ClickHookName%
 Exec=qmlscene $@ %ClickHookName%/Main.qml
 Icon=%ClickHookName%/%ClickHookName%.png
 Terminal=false

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.pro'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.pro	2015-05-22 15:37:52 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.pro	2015-08-27 10:44:50 +0000
@@ -7,7 +7,6 @@
              $$files(*.js,true)
 
 CONF_FILES +=  %ClickHookName%.apparmor \
-               %ClickHookName%.desktop \
                %ClickHookName%.png
 
 AP_TEST_FILES += tests/autopilot/run \
@@ -15,7 +14,8 @@
 
 OTHER_FILES += $${CONF_FILES} \
                $${QML_FILES} \
-               $${AP_TEST_FILES}
+               $${AP_TEST_FILES} \
+               %ClickHookName%.desktop
 
 #specify where the qml/js files are installed to
 qml_files.path = /%ClickHookName%
@@ -25,4 +25,10 @@
 config_files.path = /%ClickHookName%
 config_files.files += $${CONF_FILES}
 
-INSTALLS+=config_files qml_files
+#install the desktop file, a translated version is 
+#automatically created in the build directory
+desktop_file.path = /%ClickHookName%
+desktop_file.files = $$OUT_PWD/%ClickHookName%.desktop
+desktop_file.CONFIG += no_check_exist
+
+INSTALLS+=config_files qml_files desktop_file

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/projectName.pro'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/projectName.pro	2015-05-26 09:46:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/projectName.pro	2015-08-27 10:44:50 +0000
@@ -21,19 +21,20 @@
 # template is created in po/template.pot, to create a
 # translation copy the template to e.g. de.po and edit the sources
 UBUNTU_TRANSLATION_SOURCES+= \
-    $$files(app/*.qml,true) \
-    $$files(app/*.js,true)
+    $$files(*.qml,true) \
+    $$files(*.js,true) \
+    $$files(*.desktop,true)
 
 # specifies all translations files and makes sure they are
 # compiled and installed into the right place in the click package
 UBUNTU_PO_FILES+=$$files(po/*.po)
 
 aptest.target   = autopilot
-aptest.commands = bash $$PWD/app/tests/autopilot/run
-aptest.depends  = sub-app
+aptest.commands = bash $$PWD/%ClickHookName%/tests/autopilot/run
+aptest.depends  = sub-%ClickHookName%
 
 unittest.target   = check
-unittest.commands = /usr/bin/qmltestrunner -input $$PWD/app/tests/unit 
-unittest.depends  = sub-app
+unittest.commands = /usr/bin/qmltestrunner -input $$PWD/%ClickHookName%/tests/unit 
+unittest.depends  = sub-%ClickHookName%
 
 QMAKE_EXTRA_TARGETS += aptest unittest

=== modified file 'share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py'
--- share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py	2015-06-01 14:26:02 +0000
+++ share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py	2015-08-27 10:44:50 +0000
@@ -441,7 +441,7 @@
 success = subprocess.call(
     ["pkcon","--allow-untrusted","install-local",options.clickPck,"-p"])
 if success != 0:
-    print("Sdk-Launcher> Installing the application failed",flush=True)
+    print("Sdk-Launcher> Installing the application failed",flush=True,file=sys.stderr)
     sys.exit(1)
 
 print("Sdk-Launcher> Application installed successfully",flush=True)
@@ -451,6 +451,7 @@
 procStdOut      = None
 stderrPipeName  = None
 procStdErr      = None
+syslogHandle    = None
 
 try:
     confined = is_confined(manifest,hook_name)
@@ -494,8 +495,12 @@
     stderrPipeName = tmp_dir+app_id+".stderr"
     procStdErr = create_procpipe(stderrPipeName,on_proc_stderr)
 
-    syslogFileName = "/var/log/syslog"
-    syslogHandle = create_filelistener("/var/log/syslog",on_syslog_update)
+    try:
+        syslogFileName = "/var/log/syslog"
+        syslogHandle = create_filelistener("/var/log/syslog",on_syslog_update)
+    except OSError:
+        print("Sdk-Launcher> Not able to open syslog, apparmor errors will not be reported.",flush=True,file=sys.stderr)
+
 
     if "unix_signal_add" in dir(GLib):
         GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGTERM, on_sigterm, runner)

=== modified file 'src/ubuntu/ubuntupackagestep.cpp'
--- src/ubuntu/ubuntupackagestep.cpp	2015-07-08 15:43:11 +0000
+++ src/ubuntu/ubuntupackagestep.cpp	2015-08-27 10:44:50 +0000
@@ -62,7 +62,7 @@
                            false).toBool();
 
     if (!settings.value(QLatin1String(Constants::SETTINGS_KEY_ENABLE_DEBUG_HELPER_DEFAULT),
-                       false).toBool())
+                       true).toBool())
         m_debugMode = DisableDebugScript;
 
     settings.endGroup();

=== modified file 'ubuntu-click-tools.prf'
--- ubuntu-click-tools.prf	2015-01-16 13:06:04 +0000
+++ ubuntu-click-tools.prf	2015-08-27 10:44:50 +0000
@@ -26,40 +26,60 @@
 
 !isEmpty(UBUNTU_MANIFEST_FILE){
     OTHER_FILES+=$$UBUNTU_MANIFEST_FILE
-    manifest_file.target   = $$OUT_PWD/manifest.json
+    manifest_file.target   = $$shadowed($$_PRO_FILE_PWD_)/manifest.json
     manifest_file.commands = sed s/@CLICK_ARCH@/$$UBUNTU_CLICK_ARCH/g $$absolute_path($${UBUNTU_MANIFEST_FILE},$$_PRO_FILE_PWD_) > $${manifest_file.target}
     manifest_file.depends  = $$absolute_path($${UBUNTU_MANIFEST_FILE},$$_PRO_FILE_PWD_)
 
     QMAKE_EXTRA_TARGETS+=manifest_file
+    QMAKE_CLEAN += $${manifest_file.target}
     ubuntuAddPreTargetDep($${manifest_file.target})
 
     manifest_file_install.path  = /
-    manifest_file_install.files = $${OUT_PWD}/manifest.json
+    manifest_file_install.files = $$manifest_file.target
     manifest_file_install.CONFIG +=no_check_exist
     INSTALLS+=manifest_file_install
 }
 
 !isEmpty(UBUNTU_TRANSLATION_SOURCES){
+    isEmpty(UBUNTU_TRANSLATION_DOMAIN):error("UBUNTU_TRANSLATION_DOMAIN not defined")
+
     # iterate over all QML/JS files and create a basic translation template
-    template_pot.target=$$_PRO_FILE_PWD_/po/template.pot
+    template_pot.target=$$_PRO_FILE_PWD_/po/$${UBUNTU_TRANSLATION_DOMAIN}.pot
     for(filelist, UBUNTU_TRANSLATION_SOURCES) {
         resolved_filelist = $$absolute_path($$filelist,$$_PRO_FILE_PWD_)
         resolved_filelist = $$files($$resolved_filelist)
+
         for(file,resolved_filelist) {
-            template_pot.depends+=$$file
+            RESULT = $$find(file, "\\.desktop(\\.in)?$")
+            count(RESULT, 1) {
+                # extract the strings from the desktop file, and feed them to xgettext
+                target_file = "$$shadowed($$_PRO_FILE_PWD_)/$$relative_path($$file,$$_PRO_FILE_PWD_).h"
+                target_dir  = $$dirname(target_file)
+                target_name = $$replace(target_file,"[/.-]","_")
+
+                $${target_name}.target=$$target_file
+                $${target_name}.commands=mkdir -p $$target_dir && cd $$target_dir && intltool-extract --type="gettext/ini" --update --srcdir=$$dirname(file) $$basename(file)
+                $${target_name}.depends+=$$file
+                QMAKE_EXTRA_TARGETS+=$$target_name
+
+                template_pot.depends+=$$target_file
+                QMAKE_CLEAN += $$target_file
+
+                translated_desktop_files+=$$file
+            } else {
+                template_pot.depends+=$$file
+            }
         }
-
     }
 
     !isEmpty(template_pot.depends) {
-        template_pot.commands=mkdir -p $$_PRO_FILE_PWD_/po && xgettext -o $$template_pot.target --qt --c++ --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 $$template_pot.depends --from-code=UTF-8
+        template_pot.commands=mkdir -p $$_PRO_FILE_PWD_/po && xgettext -o $$template_pot.target --qt --c++ --from-code=UTF-8 --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 --keyword=N_ $$template_pot.depends
 
         QMAKE_EXTRA_TARGETS+=template_pot
-        ubuntuAddPreTargetDep($$_PRO_FILE_PWD_/po/template.pot)
+        ubuntuAddPreTargetDep($${template_pot.target})
     }
 
     !isEmpty(UBUNTU_PO_FILES){
-        isEmpty(UBUNTU_TRANSLATION_DOMAIN):error("UBUNTU_TRANSLATION_DOMAIN not defined")
         # compile the mo files into po files
         for(filelist, UBUNTU_PO_FILES) {
             resolved_filelist = $$absolute_path($$filelist,$$_PRO_FILE_PWD_)
@@ -69,22 +89,55 @@
                 lang=$$split(lang, .)
                 lang=$$first(lang)
 
+                # add a target that automatically updates the po files from the template
+                update_target_file = $$shadowed($$_PRO_FILE_PWD_)/po/$$basename(file).updated
+
+                target_name=update_po_target_$$lang
+                $${target_name}.target = $${update_target_file}
+                $${target_name}.commands =cd $$_PRO_FILE_PWD_/po && LC_ALL=C intltool-update -d $$lang -g template -x && touch $${update_target_file}
+                $${target_name}.depends+=$${template_pot.target}
+
+                QMAKE_EXTRA_TARGETS+=$$target_name
+                QMAKE_CLEAN += $$update_target_file
+                ubuntuAddPreTargetDep($${update_target_file})
+
+                # build the .mo files
                 target_name=mo_target_$$lang
                 target_file=$$shadowed($$_PRO_FILE_PWD_)/po/$${lang}/$${UBUNTU_TRANSLATION_DOMAIN}.mo
 
                 $${target_name}.target=$$target_file
-                $${target_name}.commands=mkdir -p po/$${lang} && msgfmt -o $${target_file} $$absolute_path($$file,$$_PRO_FILE_PWD_)
-                $${target_name}.depends+=$$absolute_path($$file,$$_PRO_FILE_PWD_)
+                $${target_name}.commands=mkdir -p po/$${lang} && LC_ALL=C msgfmt -o $${target_file} $$absolute_path($$file,$$_PRO_FILE_PWD_)
+                $${target_name}.depends+=$$absolute_path($$file,$$_PRO_FILE_PWD_) $${update_target_file}
 
                 $${target_name}_inst.path =/share/locale/$${lang}/LC_MESSAGES
                 $${target_name}_inst.CONFIG +=no_check_exist
                 $${target_name}_inst.files=$$target_file
 
+                registered_po_files+=$$absolute_path($$file,$$_PRO_FILE_PWD_)
                 QMAKE_EXTRA_TARGETS+=$$target_name
+                QMAKE_CLEAN += $$target_file
                 ubuntuAddPreTargetDep($${target_file})
 
                 INSTALLS += $${target_name}_inst
             }
         }
     }
+
+    !isEmpty(translated_desktop_files) {
+        #merge the translations into the desktop files
+        for(file, translated_desktop_files) {
+            target_file = $$shadowed($$_PRO_FILE_PWD_)/$$relative_path($$file,$$_PRO_FILE_PWD_)
+            target_file = $$replace(target_file,"\\.in$","")
+
+            target_name = $$replace(target_file,"[/.-]","_")
+            $${target_name}.target=$$target_file
+            $${target_name}.commands=LC_ALL=C intltool-merge -d -u $$_PRO_FILE_PWD_/po $$file $$target_file > /dev/null
+            $${target_name}.depends+=$$registered_po_files \
+                                     $$file
+
+            QMAKE_EXTRA_TARGETS+=$$target_name
+            QMAKE_CLEAN += $$target_file
+            ubuntuAddPreTargetDep($${target_file})
+        }
+    }
 }