gnucash master: Re-enable generation of POTFILES.in

John Ralls jralls at code.gnucash.org
Tue Sep 12 17:28:28 EDT 2017


Updated	 via  https://github.com/Gnucash/gnucash/commit/1dea835c (commit)
	from  https://github.com/Gnucash/gnucash/commit/0cdd7769 (commit)



commit 1dea835c316d39e22e353319d0a2ac680f3ff55e
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Sep 12 14:13:23 2017 -0700

    Re-enable generation of POTFILES.in
    
    With a hack to get the right line-endings on Windows.

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 872d388..de4098a 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -116,14 +116,14 @@ FUNCTION(MAKE_GNUCASH_POTFILES)
 
   # Write out the final list.
   # intltool-update insists that this file be in the source directory. :-(
-  SET(POTFILES_IN_PATH ${CMAKE_CURRENT_SOURCE_DIR}/POTFILES.in)
+  SET(POTFILES_IN_PATH ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in)
   FILE(WRITE ${POTFILES_IN_PATH} "# This is a list of files which contain translatable strings.
 # This file was generated by ../make-gnucash-potfiles.
 ")
 
   FOREACH(path ${POTFILES})
     STRING(REGEX MATCH gschema.xml.in.in IS_GSCHEMA ${path})
-    IF(IS_GSCHEMA AND NOT WIN32)
+    IF(IS_GSCHEMA)
       # Force parse type for gsettings files
       SET(path "[type: gettext/gsettings]${path}")
     ENDIF()
@@ -136,7 +136,7 @@ gnucash/gnome/gnucash.desktop.in.in
 libgnucash/engine/qofbookslots.h
 doc/tip_of_the_day.list.in
 ")
-
+  CONFIGURE_FILE(${POTFILES_IN_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/POTFILES.in NEWLINE_STYLE LF)
 ENDFUNCTION()
 
 find_program(INTLTOOL_UPDATE NAMES intltool-update)
@@ -146,7 +146,7 @@ ENDIF ()
 
 IF(BUILDING_FROM_VCS)
 
-#  MAKE_GNUCASH_POTFILES()
+  MAKE_GNUCASH_POTFILES()
 
   find_program(INTLTOOL_EXTRACT NAMES intltool-extract)
   find_program(XGETTEXT xgettext)



Summary of changes:
 po/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list