From ba799feb2a13341a14f96f1b491f27255cc94ed8 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Tue, 27 Feb 2018 15:45:38 +0100 Subject: [PATCH] Drop intltool in favour or using modern gettext This requires at least gettext 0.19.6, and will break our ubuntu 14.04LTS test instance on Travis. The next commit will work around this. --- .gitignore | 1 + CMakeLists.txt | 6 --- .../cmake_modules/GncAddGSchemaTargets.cmake | 10 +---- doc/CMakeLists.txt | 4 +- ..._the_day.list.in => tip_of_the_day.list.c} | 0 gnucash/gnome-utils/CMakeLists.txt | 10 ++--- gnucash/gnome/CMakeLists.txt | 10 +++-- gnucash/gnome/gnucash.appdata.xml.in | 24 +++++------ gnucash/gnome/gnucash.desktop.in.in | 6 +-- gnucash/gschemas/CMakeLists.txt | 2 +- ...g.gnucash.dialogs.business.gschema.xml.in} | 0 ...cash.dialogs.checkprinting.gschema.xml.in} | 0 ...nucash.dialogs.commodities.gschema.xml.in} | 0 ....in => org.gnucash.dialogs.gschema.xml.in} | 0 ....gnucash.dialogs.reconcile.gschema.xml.in} | 0 ...=> org.gnucash.dialogs.sxs.gschema.xml.in} | 0 ...> org.gnucash.dialogs.totd.gschema.xml.in} | 0 ...cash.general.finance-quote.gschema.xml.in} | 0 ...a.xml.in.in => org.gnucash.gschema.xml.in} | 0 ....in => org.gnucash.history.gschema.xml.in} | 0 ...in => org.gnucash.warnings.gschema.xml.in} | 0 ....window.pages.account.tree.gschema.xml.in} | 0 ...> org.gnucash.window.pages.gschema.xml.in} | 0 .../import-export/aqb/gschemas/CMakeLists.txt | 2 +- ...nucash.dialogs.import.hbci.gschema.xml.in} | 0 .../csv-exp/gschemas/CMakeLists.txt | 2 +- ...gnucash.dialogs.export.csv.gschema.xml.in} | 0 .../csv-imp/gschemas/CMakeLists.txt | 2 +- ...gnucash.dialogs.import.csv.gschema.xml.in} | 0 gnucash/import-export/gschemas/CMakeLists.txt | 2 +- ...ash.dialogs.import.generic.gschema.xml.in} | 0 .../import-export/ofx/gschemas/CMakeLists.txt | 2 +- ...gnucash.dialogs.import.ofx.gschema.xml.in} | 0 .../qif-imp/gschemas/CMakeLists.txt | 2 +- ...gnucash.dialogs.import.qif.gschema.xml.in} | 0 po/CMakeLists.txt | 39 ++++-------------- po/POTFILES.in | 40 +++++++++---------- po/check-po.cmake | 23 ----------- po/gnucash-pot.cmake | 37 ++++++++++++----- 39 files changed, 93 insertions(+), 131 deletions(-) rename doc/{tip_of_the_day.list.in => tip_of_the_day.list.c} (100%) rename gnucash/gschemas/{org.gnucash.dialogs.business.gschema.xml.in.in => org.gnucash.dialogs.business.gschema.xml.in} (100%) rename gnucash/gschemas/{org.gnucash.dialogs.checkprinting.gschema.xml.in.in => org.gnucash.dialogs.checkprinting.gschema.xml.in} (100%) rename gnucash/gschemas/{org.gnucash.dialogs.commodities.gschema.xml.in.in => org.gnucash.dialogs.commodities.gschema.xml.in} (100%) rename gnucash/gschemas/{org.gnucash.dialogs.gschema.xml.in.in => org.gnucash.dialogs.gschema.xml.in} (100%) rename gnucash/gschemas/{org.gnucash.dialogs.reconcile.gschema.xml.in.in => org.gnucash.dialogs.reconcile.gschema.xml.in} (100%) rename gnucash/gschemas/{org.gnucash.dialogs.sxs.gschema.xml.in.in => org.gnucash.dialogs.sxs.gschema.xml.in} (100%) rename gnucash/gschemas/{org.gnucash.dialogs.totd.gschema.xml.in.in => org.gnucash.dialogs.totd.gschema.xml.in} (100%) rename gnucash/gschemas/{org.gnucash.general.finance-quote.gschema.xml.in.in => org.gnucash.general.finance-quote.gschema.xml.in} (100%) rename gnucash/gschemas/{org.gnucash.gschema.xml.in.in => org.gnucash.gschema.xml.in} (100%) rename gnucash/gschemas/{org.gnucash.history.gschema.xml.in.in => org.gnucash.history.gschema.xml.in} (100%) rename gnucash/gschemas/{org.gnucash.warnings.gschema.xml.in.in => org.gnucash.warnings.gschema.xml.in} (100%) rename gnucash/gschemas/{org.gnucash.window.pages.account.tree.gschema.xml.in.in => org.gnucash.window.pages.account.tree.gschema.xml.in} (100%) rename gnucash/gschemas/{org.gnucash.window.pages.gschema.xml.in.in => org.gnucash.window.pages.gschema.xml.in} (100%) rename gnucash/import-export/aqb/gschemas/{org.gnucash.dialogs.import.hbci.gschema.xml.in.in => org.gnucash.dialogs.import.hbci.gschema.xml.in} (100%) rename gnucash/import-export/csv-exp/gschemas/{org.gnucash.dialogs.export.csv.gschema.xml.in.in => org.gnucash.dialogs.export.csv.gschema.xml.in} (100%) rename gnucash/import-export/csv-imp/gschemas/{org.gnucash.dialogs.import.csv.gschema.xml.in.in => org.gnucash.dialogs.import.csv.gschema.xml.in} (100%) rename gnucash/import-export/gschemas/{org.gnucash.dialogs.import.generic.gschema.xml.in.in => org.gnucash.dialogs.import.generic.gschema.xml.in} (100%) rename gnucash/import-export/ofx/gschemas/{org.gnucash.dialogs.import.ofx.gschema.xml.in.in => org.gnucash.dialogs.import.ofx.gschema.xml.in} (100%) rename gnucash/import-export/qif-imp/gschemas/{org.gnucash.dialogs.import.qif.gschema.xml.in.in => org.gnucash.dialogs.import.qif.gschema.xml.in} (100%) delete mode 100644 po/check-po.cmake diff --git a/.gitignore b/.gitignore index 7cb7509ccf..478f7a16f2 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,7 @@ make-gnucash-potfiles missing mkinstalldirs po/.intltool-merge-cache +po/LINGUAS po/Makefile.in.in po/POTFILES po/POTFILES.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 2038ec3c74..295c40f655 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,8 +172,6 @@ IF (WIN32) SET(REGEX_LDFLAGS "-L${REGEX_LIB_PATH} -lregex") #SET(LIBXSLT_INCLUDE_DIR ${CMAKE_PREFIX_PATH}/libxslt/include) #SET(LIBXSLT_XSLTPROC_EXECUTABLE ${CMAKE_PREFIX_PATH}/libxslt/bin/xsltproc) - # I have not yet debugged the intltool-merge file generation process on Windows. - SET(NO_INTLTOOL TRUE) #Prevent creating a console window on startup. SET(CMAKE_EXE_LINKER_FLAGS -mwindows) ENDIF(WIN32) @@ -249,12 +247,8 @@ ENDIF() -FIND_PROGRAM(INTLTOOL_MERGE NAMES intltool-merge HINTS ${CMAKE_PREFIX_PATH}/gnome/bin) FIND_PROGRAM(GLIB_COMPILE_SCHEMAS glib-compile-schemas HINTS ${CMAKE_PREFIX_PATH}/gnome/bin) FIND_PROGRAM(MSGFMT msgfmt) -IF(NOT INTLTOOL_MERGE) - MESSAGE(SEND_ERROR "Can't find intltool-merge program. Please set INTLTOOL_MERGE.") -ENDIF(NOT INTLTOOL_MERGE) IF (NOT GLIB_COMPILE_SCHEMAS) MESSAGE(SEND_ERROR "Can't find glib-compile-schemas program. Please set GLIB_COMPILE_SCHEMAS.") diff --git a/common/cmake_modules/GncAddGSchemaTargets.cmake b/common/cmake_modules/GncAddGSchemaTargets.cmake index 8c519f93d4..4c0a6509bc 100644 --- a/common/cmake_modules/GncAddGSchemaTargets.cmake +++ b/common/cmake_modules/GncAddGSchemaTargets.cmake @@ -11,17 +11,9 @@ macro(add_gschema_targets _gschema_INPUTS) SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env) ENDIF() FOREACH(file ${_gschema_INPUTS}) - configure_file(${file}.in.in ${file}.in @ONLY) set(_OUTPUT_FILE ${DATADIR_BUILD}/glib-2.0/schemas/${file}) - ADD_CUSTOM_COMMAND( - OUTPUT ${_OUTPUT_FILE} - COMMAND ${CMAKE_COMMAND_TMP} - LC_ALL=C - ${PERL_EXECUTABLE} ${INTLTOOL_MERGE} -x -u ${INITTOOL_OPTIONS} ${CMAKE_CURRENT_BINARY_DIR}/${file}.in ${_OUTPUT_FILE} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${file}.in - MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/${file}.in.in - ) + configure_file(${file}.in ${_OUTPUT_FILE} @ONLY) list(APPEND _gschema_OUTPUTS ${_OUTPUT_FILE}) string(REPLACE ".xml" ".valid" file_no_xml ${file}) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 56296e8ea5..a369e57284 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -19,7 +19,7 @@ SET(doc_DATA SET(doc_noinst_DATA build-aix.txt build-solaris.txt CMakeLists.txt gnc-fq-dump.1 gnc-fq-helper.1 gnucash.1.in - misc-notes.txt README.HBCI README.OFX README.translator.txt tip_of_the_day.list.in + misc-notes.txt README.HBCI README.OFX README.translator.txt tip_of_the_day.list.c TRANSLATION_HOWTO) INSTALL(FILES ${doc_DATA} DESTINATION ${CMAKE_INSTALL_DOCDIR}) @@ -32,7 +32,7 @@ FILE(COPY ${doc_DATA} DESTINATION ${DATADIR_BUILD}/doc/gnucash) # Generate the tip of the day file. EXECUTE_PROCESS( - COMMAND ${CMAKE_C_COMPILER} -E -P -x c -DN_\(x\)=x -o ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list.tmp ${CMAKE_CURRENT_SOURCE_DIR}/tip_of_the_day.list.in + COMMAND ${CMAKE_C_COMPILER} -E -P -x c -DN_\(x\)=x -o ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list.tmp ${CMAKE_CURRENT_SOURCE_DIR}/tip_of_the_day.list.c ) FILE(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list.tmp TIP_OF_THE_DAY_LINES) diff --git a/doc/tip_of_the_day.list.in b/doc/tip_of_the_day.list.c similarity index 100% rename from doc/tip_of_the_day.list.in rename to doc/tip_of_the_day.list.c diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt index 95b179c4ab..065ec9dbf9 100644 --- a/gnucash/gnome-utils/CMakeLists.txt +++ b/gnucash/gnome-utils/CMakeLists.txt @@ -10,21 +10,21 @@ gnc_add_swig_guile_command (swig-gnome-utils-c ${CMAKE_CURRENT_SOURCE_DIR}/gnome-utils.i ) -SET (WARNINGS_SCHEMA ../gschemas/org.gnucash.warnings.gschema.xml.in) +SET (WARNINGS_SCHEMA ${DATADIR_BUILD}/glib-2.0/schemas/org.gnucash.warnings.gschema.xml) SET (GNC_WARNINGS_C ${CMAKE_CURRENT_BINARY_DIR}/gnc-warnings.c) SET (GNC_WARNINGS_H ${CMAKE_CURRENT_BINARY_DIR}/gnc-warnings.h) ADD_CUSTOM_COMMAND( OUTPUT ${GNC_WARNINGS_C} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${WARNINGS_SCHEMA} make-gnc-warnings-c.xsl + DEPENDS ${WARNINGS_SCHEMA} make-gnc-warnings-c.xsl COMMAND - ${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_C} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-c.xsl ${CMAKE_CURRENT_BINARY_DIR}/${WARNINGS_SCHEMA} + ${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_C} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-c.xsl ${WARNINGS_SCHEMA} ) ADD_CUSTOM_COMMAND( OUTPUT ${GNC_WARNINGS_H} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${WARNINGS_SCHEMA} make-gnc-warnings-h.xsl + DEPENDS ${WARNINGS_SCHEMA} make-gnc-warnings-h.xsl COMMAND - ${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_H} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-h.xsl ${CMAKE_CURRENT_BINARY_DIR}/${WARNINGS_SCHEMA} + ${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_H} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-h.xsl ${WARNINGS_SCHEMA} ) #GTK before 3.14 didn't have GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt index 111fc49621..be1ceb7b33 100644 --- a/gnucash/gnome/CMakeLists.txt +++ b/gnucash/gnome/CMakeLists.txt @@ -171,8 +171,9 @@ ADD_CUSTOM_COMMAND( OUTPUT gnucash.appdata.xml COMMAND ${CMAKE_COMMAND_TMP} LC_ALL=C - ${PERL_EXECUTABLE} ${INTLTOOL_MERGE} -x -u -c ${CMAKE_SOURCE_DIR}/po/.intltool-merge-cache ${CMAKE_SOURCE_DIR}/po - ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in gnucash.appdata.xml + ${MSGFMT} --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in + -d ${CMAKE_SOURCE_DIR}/po + -o gnucash.appdata.xml DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in ) @@ -188,8 +189,9 @@ ADD_CUSTOM_COMMAND( OUTPUT gnucash.desktop COMMAND ${CMAKE_COMMAND_TMP} LC_ALL=C - ${PERL_EXECUTABLE} ${INTLTOOL_MERGE} -d -u -c ${CMAKE_SOURCE_DIR}/po/.intltool-merge-cache ${CMAKE_SOURCE_DIR}/po - gnucash.desktop.in gnucash.desktop + ${MSGFMT} --desktop --template gnucash.desktop.in + -d ${CMAKE_SOURCE_DIR}/po + -o gnucash.desktop DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop.in ) diff --git a/gnucash/gnome/gnucash.appdata.xml.in b/gnucash/gnome/gnucash.appdata.xml.in index 72e53f8fa3..4b9dbec579 100644 --- a/gnucash/gnome/gnucash.appdata.xml.in +++ b/gnucash/gnome/gnucash.appdata.xml.in @@ -6,22 +6,22 @@ GnuCash Manage your finances, accounts, and investments - <_p> +

GnuCash is a program for personal and small-business financial-accounting. - - <_p> +

+

Designed to be easy to use, yet powerful and flexible, GnuCash allows you to track bank accounts, stocks, income and expenses. As quick and intuitive to use as a checkbook register, it is based on professional accounting principles like double-entry accounting to ensure balanced books and accurate reports. - - <_p>With GnuCash you can (but are not limited to): +

+

With GnuCash you can (but are not limited to):

 diff --git a/gnucash/gnome/gnucash.desktop.in.in b/gnucash/gnome/gnucash.desktop.in.in index 651473731b..ed28df3547 100644 --- a/gnucash/gnome/gnucash.desktop.in.in +++ b/gnucash/gnome/gnucash.desktop.in.in @@ -2,9 +2,9 @@ Type=Application MimeType=application/x-gnucash; Version=0.9.4 -_Name=GnuCash -_GenericName=Finance Management -_Comment=Manage your finances, accounts, and investments +Name=GnuCash +GenericName=Finance Management +Comment=Manage your finances, accounts, and investments Exec=gnucash %f Icon=gnucash-icon StartupNotify=true diff --git a/gnucash/gschemas/CMakeLists.txt b/gnucash/gschemas/CMakeLists.txt index a4bcc97e24..9c7b1e0cd4 100644 --- a/gnucash/gschemas/CMakeLists.txt +++ b/gnucash/gschemas/CMakeLists.txt @@ -38,6 +38,6 @@ install(CODE "execute_process( SET(gschemas_DIST_local "") FOREACH(file ${gschema_SOURCES}) - LIST(APPEND gschemas_DIST_local ${file}.in.in) + LIST(APPEND gschemas_DIST_local ${file}.in) ENDFOREACH() SET_DIST_LIST(gschemas_DIST CMakeLists.txt ${gschemas_DIST_local}) diff --git a/gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in diff --git a/gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in diff --git a/gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in diff --git a/gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in diff --git a/gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in diff --git a/gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in diff --git a/gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in diff --git a/gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in diff --git a/gnucash/gschemas/org.gnucash.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.gschema.xml.in diff --git a/gnucash/gschemas/org.gnucash.history.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.history.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.history.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.history.gschema.xml.in diff --git a/gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.warnings.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.warnings.gschema.xml.in diff --git a/gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in diff --git a/gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in similarity index 100% rename from gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in.in rename to gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in diff --git a/gnucash/import-export/aqb/gschemas/CMakeLists.txt b/gnucash/import-export/aqb/gschemas/CMakeLists.txt index e97fa4f11b..b22f8ebccd 100644 --- a/gnucash/import-export/aqb/gschemas/CMakeLists.txt +++ b/gnucash/import-export/aqb/gschemas/CMakeLists.txt @@ -5,4 +5,4 @@ IF (WITH_AQBANKING) add_gschema_targets("${aqb_GSCHEMA}") ENDIF(WITH_AQBANKING) -SET_DIST_LIST(aqbanking_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.hbci.gschema.xml.in.in) +SET_DIST_LIST(aqbanking_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.hbci.gschema.xml.in) diff --git a/gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in b/gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in similarity index 100% rename from gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in rename to gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in diff --git a/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt b/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt index 04c045c311..8f8abd1cd5 100644 --- a/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt +++ b/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt @@ -3,4 +3,4 @@ SET(csv_exp_GSCHEMA org.gnucash.dialogs.export.csv.gschema.xml) add_gschema_targets("${csv_exp_GSCHEMA}") -SET_DIST_LIST(csv_exp_gschema_DIST CMakeLists.txt org.gnucash.dialogs.export.csv.gschema.xml.in.in) +SET_DIST_LIST(csv_exp_gschema_DIST CMakeLists.txt org.gnucash.dialogs.export.csv.gschema.xml.in) diff --git a/gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in b/gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in similarity index 100% rename from gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in rename to gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in diff --git a/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt b/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt index 8dc5631f5c..e108432153 100644 --- a/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt +++ b/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt @@ -2,4 +2,4 @@ SET(csv_imp_GSCHEMA org.gnucash.dialogs.import.csv.gschema.xml) add_gschema_targets("${csv_imp_GSCHEMA}") -SET_DIST_LIST(csv_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.csv.gschema.xml.in.in) +SET_DIST_LIST(csv_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.csv.gschema.xml.in) diff --git a/gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in b/gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in similarity index 100% rename from gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in rename to gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in diff --git a/gnucash/import-export/gschemas/CMakeLists.txt b/gnucash/import-export/gschemas/CMakeLists.txt index 4f3f74d844..e5290f1b8d 100644 --- a/gnucash/import-export/gschemas/CMakeLists.txt +++ b/gnucash/import-export/gschemas/CMakeLists.txt @@ -3,4 +3,4 @@ SET(generic_import_GSCHEMA org.gnucash.dialogs.import.generic.gschema.xml) add_gschema_targets("${generic_import_GSCHEMA}") -SET_DIST_LIST(generic_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.generic.gschema.xml.in.in) +SET_DIST_LIST(generic_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.generic.gschema.xml.in) diff --git a/gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in b/gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in similarity index 100% rename from gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in rename to gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in diff --git a/gnucash/import-export/ofx/gschemas/CMakeLists.txt b/gnucash/import-export/ofx/gschemas/CMakeLists.txt index 7cb99c20f7..89bcea4e42 100644 --- a/gnucash/import-export/ofx/gschemas/CMakeLists.txt +++ b/gnucash/import-export/ofx/gschemas/CMakeLists.txt @@ -5,4 +5,4 @@ IF (WITH_OFX) add_gschema_targets("${ofx_GSCHEMA}") ENDIF (WITH_OFX) -SET_DIST_LIST(ofx_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.ofx.gschema.xml.in.in) +SET_DIST_LIST(ofx_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.ofx.gschema.xml.in) diff --git a/gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in b/gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in similarity index 100% rename from gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in rename to gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in diff --git a/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt b/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt index ddb41bf215..fa15f03b89 100644 --- a/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt +++ b/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt @@ -3,4 +3,4 @@ set(qif_imp_GSCHEMA org.gnucash.dialogs.import.qif.gschema.xml) add_gschema_targets("${qif_imp_GSCHEMA}") -SET_DIST_LIST(qif_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.qif.gschema.xml.in.in) +SET_DIST_LIST(qif_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.qif.gschema.xml.in) diff --git a/gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in b/gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in similarity index 100% rename from gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in rename to gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 0f7ed912b2..389606096d 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -9,6 +9,8 @@ SET (NEW_LINGUAS as brx doi es_NI kok kok@latin ks mai mni mni@bengali) SET (ALL_LINGUAS ${TP_LINGUAS} ${GC_LINGUAS} ${NEW_LINGUAS}) +file (WRITE LINGUAS "${ALL_LINGUAS}") + SET (CATALOGS "") SET (BUILD_CATALOGS "") @@ -18,12 +20,14 @@ IF (${CMAKE_VERSION} VERSION_GREATER 3.1) ENDIF() SET(po_SOURCES "") +file (WRITE LINGUAS "") FOREACH(lingua ${ALL_LINGUAS}) LIST(APPEND po_SOURCES ${lingua}.po) + file (APPEND LINGUAS "${lingua} ") ENDFOREACH() SET_LOCAL_DIST(po_DIST_local ${po_SOURCES} CMakeLists.txt ChangeLog Makevars - POTFILES.ignore POTFILES.in POTFILES.skip README check-po.cmake gnucash-pot.cmake) + POTFILES.ignore POTFILES.in POTFILES.skip README gnucash-pot.cmake) SET(po_DIST ${po_DIST_local} ${po_glossary_DIST} PARENT_SCOPE) FOREACH(lingua ${ALL_LINGUAS}) @@ -71,7 +75,7 @@ FUNCTION(MAKE_GNUCASH_POTFILES) # Create a list of candidate translation files FILE(GLOB_RECURSE FILES_IN RELATIVE ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/*.c ${CMAKE_SOURCE_DIR}/*.cpp ${CMAKE_SOURCE_DIR}/*.glade ${CMAKE_SOURCE_DIR}/*.desktop.in - ${CMAKE_SOURCE_DIR}/*.keys.in ${CMAKE_SOURCE_DIR}/*.gschema.xml.in.in ${CMAKE_SOURCE_DIR}/*.scm) + ${CMAKE_SOURCE_DIR}/*.keys.in ${CMAKE_SOURCE_DIR}/*.gschema.xml.in ${CMAKE_SOURCE_DIR}/*.scm) # Only consider files in the common, libgnucash, and gnucash/ directories. Also check against list of ignore patterns SET(FILES "") @@ -119,7 +123,7 @@ FUNCTION(MAKE_GNUCASH_POTFILES) "gnucash/gnome/gnucash.appdata.xml.in" "gnucash/gnome/gnucash.desktop.in.in" "libgnucash/engine/qofbookslots.h" - "doc/tip_of_the_day.list.in") + "doc/tip_of_the_day.list.c") # Write out the final list. # intltool-update insists that this file be in the source directory. :-( @@ -131,11 +135,6 @@ FUNCTION(MAKE_GNUCASH_POTFILES) set(POTFILE_DEPS "") FOREACH(path ${POTFILES}) list(APPEND POTFILE_DEPS ${CMAKE_SOURCE_DIR}/${path}) - STRING(REGEX MATCH gschema.xml.in.in IS_GSCHEMA ${path}) - IF(IS_GSCHEMA) - # Force parse type for gsettings files - SET(path "[type: gettext/gsettings]${path}") - ENDIF() FILE(APPEND ${POTFILES_IN_PATH} "${path}\n") ENDFOREACH() @@ -144,36 +143,24 @@ FUNCTION(MAKE_GNUCASH_POTFILES) set(gnucash_pot_depends ${POTFILE_DEPS} CACHE INTERNAL "List of files with translatable strings. If any of these change, gnucash.pot should be regenerated") ENDFUNCTION() -find_program(INTLTOOL_UPDATE NAMES intltool-update) -IF (${INTLTOOL_UPDATE} STREQUAL "INTLTOOL_UPDATE-NOTFOUND") - MESSAGE(FATAL_ERROR "Can't find the 'intltool-update' program.") -ENDIF () - IF(BUILDING_FROM_VCS) MAKE_GNUCASH_POTFILES() - find_program(INTLTOOL_EXTRACT NAMES intltool-extract) find_program(XGETTEXT xgettext) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Makevars ${CMAKE_CURRENT_BINARY_DIR}/Makevars COPYONLY) - IF (${INTLTOOL_EXTRACT} STREQUAL "INTLTOOL_EXTRACT-NOTFOUND") - MESSAGE(FATAL_ERROR "Can't find the 'intltool-extract' program.") - ENDIF () - IF (${XGETTEXT} STREQUAL "XGETTEXT-NOTFOUND") MESSAGE(FATAL_ERROR "Can't find the 'xgettext' program.") ENDIF () add_custom_command(OUTPUT gnucash.pot COMMAND ${CMAKE_COMMAND} - -D INTLTOOL_EXTRACT=${INTLTOOL_EXTRACT} - -D INTLTOOL_UPDATE=${INTLTOOL_UPDATE} + -D TOP_SRC_DIR=${CMAKE_SOURCE_DIR} -D PO_SRC_DIR=${CMAKE_CURRENT_SOURCE_DIR} -D PO_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR} -D PACKAGE=${PACKAGE} - -D PERL=${PERL_EXECUTABLE} -D XGETTEXT=${XGETTEXT} -P ${CMAKE_CURRENT_SOURCE_DIR}/gnucash-pot.cmake DEPENDS ${gnucash_pot_depends} @@ -182,13 +169,3 @@ IF(BUILDING_FROM_VCS) add_custom_target (pot DEPENDS gnucash.pot) ENDIF() dist_add_generated (${BUILDING_FROM_VCS} gnucash.pot) - -ADD_CUSTOM_TARGET(check-po - COMMAND ${CMAKE_COMMAND} - -D INTLTOOL_UPDATE=${INTLTOOL_UPDATE} - -D PO_DIR=${CMAKE_CURRENT_SOURCE_DIR} - -P check-po.cmake - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -) - -add_dependencies(check check-po) diff --git a/po/POTFILES.in b/po/POTFILES.in index 24f70dd5cc..aa029c32ae 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -238,19 +238,19 @@ gnucash/gnome-utils/search-param.c gnucash/gnome-utils/tree-view-utils.c gnucash/gnome-utils/window-main-summarybar.c gnucash/gnucash-bin.c -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in.in -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.gschema.xml.in.in -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.history.gschema.xml.in.in -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in -[type: gettext/gsettings]gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in.in +gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in +gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in +gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in +gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in +gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in +gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in +gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in +gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in +gnucash/gschemas/org.gnucash.gschema.xml.in +gnucash/gschemas/org.gnucash.history.gschema.xml.in +gnucash/gschemas/org.gnucash.warnings.gschema.xml.in +gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in +gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in gnucash/html/gnc-html.c gnucash/html/gnc-html-factory.c gnucash/html/gnc-html-history.c @@ -272,7 +272,7 @@ gnucash/import-export/aqb/gnc-file-aqb-import.c gnucash/import-export/aqb/gnc-gwen-gui.c gnucash/import-export/aqb/gncmod-aqbanking.c gnucash/import-export/aqb/gnc-plugin-aqbanking.c -[type: gettext/gsettings]gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in +gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in gnucash/import-export/bi-import/dialog-bi-import.c gnucash/import-export/bi-import/dialog-bi-import-gui.c gnucash/import-export/bi-import/dialog-bi-import-helper.c @@ -285,7 +285,7 @@ gnucash/import-export/csv-exp/csv-transactions-export.c gnucash/import-export/csv-exp/csv-tree-export.c gnucash/import-export/csv-exp/gncmod-csv-export.c gnucash/import-export/csv-exp/gnc-plugin-csv-export.c -[type: gettext/gsettings]gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in +gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in gnucash/import-export/csv-imp/assistant-csv-account-import.c gnucash/import-export/csv-imp/assistant-csv-account-import.glade gnucash/import-export/csv-imp/assistant-csv-price-import.cpp @@ -308,7 +308,7 @@ gnucash/import-export/csv-imp/gnc-price-props.cpp gnucash/import-export/csv-imp/gnc-tokenizer.cpp gnucash/import-export/csv-imp/gnc-trans-props.cpp gnucash/import-export/csv-imp/gnc-tx-import.cpp -[type: gettext/gsettings]gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in +gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in gnucash/import-export/customer-import/dialog-customer-import.c gnucash/import-export/customer-import/dialog-customer-import-gui.c gnucash/import-export/customer-import/gncmod-customer-import.c @@ -316,7 +316,7 @@ gnucash/import-export/customer-import/gnc-plugin-customer-import.c gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade gnucash/import-export/dialog-import.glade gnucash/import-export/gncmod-generic-import.c -[type: gettext/gsettings]gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in +gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in gnucash/import-export/import-account-matcher.c gnucash/import-export/import-backend.c gnucash/import-export/import-commodity-matcher.c @@ -334,7 +334,7 @@ gnucash/import-export/ofx/gncmod-ofx-import.c gnucash/import-export/ofx/gnc-ofx-import.c gnucash/import-export/ofx/gnc-ofx-kvp.c gnucash/import-export/ofx/gnc-plugin-ofx.c -[type: gettext/gsettings]gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in +gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in gnucash/import-export/qif/qif-context.c gnucash/import-export/qif/qif-file.c gnucash/import-export/qif/qif-objects.c @@ -344,7 +344,7 @@ gnucash/import-export/qif-imp/dialog-account-picker.c gnucash/import-export/qif-imp/dialog-account-picker.glade gnucash/import-export/qif-imp/gncmod-qif-import.c gnucash/import-export/qif-imp/gnc-plugin-qif-import.c -[type: gettext/gsettings]gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in +gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in gnucash/import-export/qif-imp/qif-dialog-utils.scm gnucash/import-export/qif-imp/qif-file.scm gnucash/import-export/qif-imp/qif-guess-map.scm @@ -707,4 +707,4 @@ libgnucash/tax/us/us.scm gnucash/gnome/gnucash.appdata.xml.in gnucash/gnome/gnucash.desktop.in.in libgnucash/engine/qofbookslots.h -doc/tip_of_the_day.list.in +doc/tip_of_the_day.list.c diff --git a/po/check-po.cmake b/po/check-po.cmake deleted file mode 100644 index 6a4dbd7950..0000000000 --- a/po/check-po.cmake +++ /dev/null @@ -1,23 +0,0 @@ - -# Run intltool-update -m to check for missing files in POTFILES.in -# We detect failure by looking for the presence of a 'missing' file. - -# Intltool returns a zero status whether or not the check failed. - -FILE(REMOVE ${PO_DIR}/missing) -IF (${CMAKE_VERSION} VERSION_GREATER 3.1) - EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND} -E env ${INTLTOOL_UPDATE} -m - WORKING_DIRECTORY ${PO_DIR} - ) -ELSE() - EXECUTE_PROCESS( - COMMAND ${INTLTOOL_UPDATE} -m - WORKING_DIRECTORY ${PO_DIR} - RESULT_VARIABLE UPDATE_RESULT - ) - MESSAGE("UPDATE_RESULT = ${UPDATE_RESULT}") -ENDIF() -IF (EXISTS ${PO_DIR}/missing) - MESSAGE(FATAL_ERROR "POTFILES.in is missing files. See 'missing' in ${PO_DIR}") -ENDIF() diff --git a/po/gnucash-pot.cmake b/po/gnucash-pot.cmake index 8ac951e68c..c3db59183d 100644 --- a/po/gnucash-pot.cmake +++ b/po/gnucash-pot.cmake @@ -1,13 +1,32 @@ -# Note: the set commands below can be integrated in the execute process -# the day we require cmake > 3.1 -# The command would then become -# COMMAND {CMAKE_COMMAND} -E env INTLTOOL_EXTRACT=${INTLTOOL_EXTRACT} .... ${PERL} ${INTLTOOL_UPDATE} .... - -set(ENV{INTLTOOL_EXTRACT} ${INTLTOOL_EXTRACT}) -set(ENV{XGETTEXT} ${XGETTEXT}) -set(ENV{srcdir} ${PO_SRC_DIR}) execute_process( - COMMAND ${PERL} ${INTLTOOL_UPDATE} -x --gettext-package ${PACKAGE} --pot + COMMAND ${XGETTEXT} --add-comments + --directory=${TOP_SRC_DIR} + --default-domain=${PACKAGE} + --output=${PACKAGE}.pot + --files-from=${PO_SRC_DIR}/POTFILES.in + --from-code=UTF-8 + --flag=g_strdup_printf:1:c-format + --flag=g_string_printf:2:c-format + --flag=g_string_append_printf:2:c-format + --flag=g_error_new:3:c-format + --flag=g_set_error:4:c-format + --flag=g_markup_printf_escaped:1:c-format + --flag=g_log:3:c-format + --flag=g_print:1:c-format + --flag=g_printerr:1:c-format + --flag=g_printf:1:c-format + --flag=g_fprintf:2:c-format + --flag=g_sprintf:2:c-format + --flag=g_snprintf:3:c-format + --flag=g_scanner_error:2:c-format + --flag=g_scanner_warn:2:c-format + --keyword=_ + --keyword=N_ + --keyword=Q_ + --keyword=translate:1,1t + --keyword=translate:1c,2,2t + --keyword=translate:1,2,3t + --keyword=translate:1c,2,3,4t WORKING_DIRECTORY ${PO_BIN_DIR} RESULT_VARIABLE GNUCASH_POT_RESULT )