Merge lp:~renatofilho/mediaplayer-app/fix-1382317 into lp:mediaplayer-app/rtm-14.09

[Renato Araujo Oliveira Filho]

Fixed cmake script to generate the necessary translations for desktop file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:303
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~renatofilho/mediaplayer-app/fix-1382317/+merge/240757/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/242/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6490
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-i386-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/6077
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7742
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7742/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15489
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4699
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4699/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/242/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGED

If you changed UI labels, did you update the pot file? NO LABEL CHANGED

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO PACKAGE CHANGE

[lp:~renatofilho/mediaplayer-app/fix-1382317]

268. By Bill Filler on 2014-11-10

update translations

269. By Renato Araujo Oliveira Filho on 2014-11-10

Fixed cmake script to generate the necessary translations for desktop file.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:269
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/243/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-i386-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/99
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15644
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/64
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/64/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/243/rebuild

review: Approve (continuous-integration)

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-06-16 14:08:17 +0000
+++ po/CMakeLists.txt	2014-11-10 17:50:21 +0000
@@ -5,11 +5,12 @@
 set(DOMAIN mediaplayer-app)
 set(POT_FILE ${DOMAIN}.pot)
 file(GLOB PO_FILES *.po)
-file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}
+file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src/*.qml)
-list(APPEND I18N_SRCS data/${DESKTOP_FILE}.in.in)
 list(SORT I18N_SRCS)
-message("Found ${I18N_SRCS}")
+
+file(RELATIVE_PATH DESKTOP_FILE_IN_IN ${CMAKE_CURRENT_SOURCE_DIR}
+     ${CMAKE_SOURCE_DIR}/data/${DESKTOP_FILE}.in.in)
 
 foreach(PO_FILE ${PO_FILES})
     get_filename_component(LANG ${PO_FILE} NAME_WE)
@@ -25,7 +26,24 @@
     add_custom_target(${POT_FILE} ALL
                   COMMENT "Generating translation template"
                   COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
-                          --srcdir=${CMAKE_SOURCE_DIR} data/${DESKTOP_FILE}.in.in
-                  COMMAND ${XGETTEXT_EXECUTABLE} --c++ --qt --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 -D ${CMAKE_SOURCE_DIR} -s -p ${CMAKE_CURRENT_SOURCE_DIR} -o mediaplayer-app.pot ${I18N_SRCS}
-    )
+                          --srcdir=${CMAKE_CURRENT_SOURCE_DIR} ${DESKTOP_FILE_IN_IN}
+                  COMMAND ${XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+		          --c++ --qt --add-comments=TRANSLATORS
+                          --keyword=tr --keyword=tr:1,2 --keyword=N_
+                          --package-name=${DOMAIN}
+                          --copyright-holder='Canonical Ltd.'
+                          -s -p ${CMAKE_CURRENT_SOURCE_DIR} 
+ 			  -D ${CMAKE_CURRENT_SOURCE_DIR} ${I18N_SRCS}
+                          -D ${CMAKE_CURRENT_BINARY_DIR} ${DESKTOP_FILE_IN_IN}.h
+    )
+
+    add_custom_target(translations
+        COMMENT "Updating translation files"
+    )
+    add_dependencies(translations ${POT_FILE})
+    foreach(PO_FILE ${PO_FILES})
+       add_custom_command(TARGET translations
+            COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} ${PO_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${POT_FILE} -o ${PO_FILE}
+       )
+    endforeach(PO_FILE)
 endif()