[geary/wip/l10n-713827: 7/7] Don't deal with the pot file ever



commit 4507d6ec76432feaaafc2e44db9468f331e9788f
Author: Charles Lindsay <chaz yorba org>
Date:   Thu Jan 9 17:53:10 2014 -0800

    Don't deal with the pot file ever

 .gitignore          |    1 -
 cmake/Gettext.cmake |    9 ++-------
 po/CMakeLists.txt   |    2 +-
 po/gen-potfile      |   27 ---------------------------
 4 files changed, 3 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3021edd..7bd279e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@ build/
 /geary
 /geary-mailer
 /geary-console
-/po/geary.pot
 *.xz
 *.swp
 bindings/vapi/gmime-2.6/gmime-2.6.gi
diff --git a/cmake/Gettext.cmake b/cmake/Gettext.cmake
index 962cc4c..3247b3b 100644
--- a/cmake/Gettext.cmake
+++ b/cmake/Gettext.cmake
@@ -76,11 +76,8 @@ IF(NOT DEFINED XGETTEXT_OPTIONS)
 ENDIF(NOT DEFINED XGETTEXT_OPTIONS)
 
 IF(XGETTEXT_FOUND)
-    MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstLang)
+    MACRO(GETTEXT_CREATE_TRANSLATIONS _firstLang)
        SET(_gmoFiles)
-       GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE)
-       GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
-
        SET(_addToAll)
        SET(_is_comment FALSE)
 
@@ -101,14 +98,12 @@ IF(XGETTEXT_FOUND)
                #MESSAGE("_absFile=${_absFile} _abs_PATH=${_abs_PATH} _lang=${_lang} 
curr_bin=${CMAKE_CURRENT_BINARY_DIR}")
                ADD_CUSTOM_COMMAND(
                    OUTPUT ${_gmoFile}
-                    COMMAND [ ! -e ${_absPotFile} ] && ${CMAKE_CURRENT_SOURCE_DIR}/../po/gen-potfile || true
-                   COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} 
${_absPotFile}
                    COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
                    DEPENDS ${_absFile}
                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                    )
 
-               INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME 
${_potBasename}.mo)
+                INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME 
${GETTEXT_PACKAGE}.mo)
                SET(_gmoFiles ${_gmoFiles} ${_gmoFile})
            ENDIF()
        ENDFOREACH (_currentLang )
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 587b88d..69ba600 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -2,7 +2,7 @@
 file(STRINGS "LINGUAS" TRANSLATED)
 
 IF (XGETTEXT_FOUND)
-    GETTEXT_CREATE_TRANSLATIONS(${GETTEXT_PACKAGE}.pot ALL ${TRANSLATED}
+    GETTEXT_CREATE_TRANSLATIONS(ALL ${TRANSLATED}
            COMMENT "Creating translations.")
 ELSE ()
     message(STATUS "xgettext not found")


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]