Merge lp:~charlesk/indicator-location/lp-1354058-use-standard-translations-cmake-file into lp:indicator-location/14.10

[Charles Kerr]

Re-use the same Translations.cmake file across indicators

Sync Translations.cmake with the bugfixed version that recently landed in indicator-datetime.

Discussion @ https://code.launchpad.net/~charlesk/indicator-datetime/lp-1354058-include-cpp-files-when-invoking-xgettext/+merge/229976

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:106
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/7
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/7/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-location-ci/41/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:106
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/8
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/8/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-location-ci/42/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

Looks like ths 2014-08-09 build failure came from a gcovr bug introduced in 3.1,<https://github.com/gcovr/gcovr/issues/37> which just landed in utopic. mterry's now backported the fix from 3.2 <https://launchpad.net/ubuntu/+source/gcovr/3.1-1ubuntu1>

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:106
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-location-ci/43/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2014-05-21 13:36:36 +0000
+++ cmake/Translations.cmake	2014-08-09 23:40:06 +0000
@@ -20,22 +20,18 @@
     add_custom_target (pot COMMENT “Building translation catalog.”)
     find_program (XGETTEXT_EXECUTABLE xgettext)
 
-
-    set(C_SOURCE "")
-
+    # init this list, which will hold all the sources across all dirs
+    set(SOURCES "")
+
+    # add each directory's sources to the overall sources list
     foreach(FILES_INPUT ${ARGN})
-        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
-        foreach(C_FILE ${SOURCE_FILES})
-            set(C_SOURCE ${C_SOURCE} ${C_FILE})
-        endforeach()
-        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
-        foreach(C_FILE ${SOURCE_FILES})
-            set(C_SOURCE ${C_SOURCE} ${C_FILE})
-        endforeach()
+        set (DIR ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT})
+        file (GLOB_RECURSE DIR_SOURCES ${DIR}/*.c ${DIR}/*.cc ${DIR}/*.cpp ${DIR}/*.cxx ${DIR}/*.vala)
+	set (SOURCES ${SOURCES} ${DIR_SOURCES})
     endforeach()
 
     add_custom_command (TARGET pot COMMAND
         ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
-        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
+        ${SOURCES} --keyword="_" --keyword="N_" --from-code=UTF-8
         )
 endmacro()

=== modified file 'po/indicator-location.pot'
--- po/indicator-location.pot	2014-05-27 08:45:28 +0000
+++ po/indicator-location.pot	2014-08-09 23:40:06 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Canonical Ltd.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: indicator-location\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-27 10:43+0200\n"
+"POT-Creation-Date: 2014-08-09 18:22-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,14 +17,15 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/phone.cc:77 src/phone.cc:80
+#: /home/charles/canonical/src/indicator-location/lp-1354058-use-standard-translations-cmake-file/po/../src//phone.cc:77
+#: /home/charles/canonical/src/indicator-location/lp-1354058-use-standard-translations-cmake-file/po/../src//phone.cc:80
 msgid "Location"
 msgstr ""
 
-#: src/phone.cc:260
+#: /home/charles/canonical/src/indicator-location/lp-1354058-use-standard-translations-cmake-file/po/../src//phone.cc:260
 msgid "Location detection"
 msgstr ""
 
-#: src/phone.cc:265
+#: /home/charles/canonical/src/indicator-location/lp-1354058-use-standard-translations-cmake-file/po/../src//phone.cc:265
 msgid "GPS"
 msgstr ""