Housekeeping - reduce the number of PACKAGE and VERSION related cmake variables

This starts by setting the gnucash version number in the 'project' call.
This will result in a number of variables set by cmake. The remainder
of this commit is to reuse the auto-generated
PROJECT_NAME, PROJECT_VERSION, PROJECT_VERSION_MAJOR
PROJECT_VERSION_MINOR, PROJECT_VERSION_PATCH and PROJECT_VERSION_TWEAK
instead of all the various instances of PACKAGE, GNUCASH_MAJOR_VERSION
and so on.

One parameter is worth mentioning - GETTEXT_PACKAGE
GnuCash is not using this directly (any more) but it has to be set before
including gi18n-lib.h.
This commit is contained in:
Geert Janssens 2020-01-17 16:28:56 +01:00
parent aa961846c6
commit d8a304c2c9
52 changed files with 93 additions and 111 deletions

View File

@ -2,22 +2,18 @@
cmake_minimum_required (VERSION 3.5) cmake_minimum_required (VERSION 3.5)
project (gnucash) project (gnucash
VERSION 3.8
)
enable_testing() enable_testing()
# Version number of gnucash # Version number of gnucash
set (GNUCASH_MAJOR_VERSION 3)
set (GNUCASH_MINOR_VERSION 8)
set (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}")
set (GNUCASH_LATEST_STABLE_SERIES 3.x) set (GNUCASH_LATEST_STABLE_SERIES 3.x)
set (PACKAGE gnucash)
set (PACKAGE_NAME GnuCash) set (PACKAGE_NAME GnuCash)
set (PACKAGE_VERSION 3.8)
set (PACKAGE_BUGREPORT "https://bugs.gnucash.org") set (PACKAGE_BUGREPORT "https://bugs.gnucash.org")
set (PACKAGE_TARNAME ${PACKAGE}) set (PACKAGE_STRING "${PACKAGE_NAME} ${PROJECT_VERSION}")
set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set (PACKAGE_URL "https://www.gnucash.org/") set (PACKAGE_URL "https://www.gnucash.org/")
# Change this in development versions when changing anything that # Change this in development versions when changing anything that
@ -25,8 +21,6 @@ set (PACKAGE_URL "https://www.gnucash.org/")
set (GNUCASH_RESAVE_VERSION "19920") set (GNUCASH_RESAVE_VERSION "19920")
set(GETTEXT_PACKAGE "gnucash")
# Clear cache variables that will be filled later during the cmake run # Clear cache variables that will be filled later during the cmake run
unset(dist_generated CACHE) unset(dist_generated CACHE)
unset(dist_generated_depends CACHE) unset(dist_generated_depends CACHE)
@ -672,8 +666,6 @@ install(FILES ${gnucash_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR})
# Create config.h # Create config.h
set (GETTEXT_PACKAGE "gnucash")
if (WIN32) if (WIN32)
if (MINGW) if (MINGW)
set (HAVE_SCANF_LLD 1) set (HAVE_SCANF_LLD 1)
@ -828,7 +820,7 @@ dist_add_generated (${BUILDING_FROM_VCS} ChangeLog)
############################ BEGIN MAKE DIST ################# ############################ BEGIN MAKE DIST #################
set(PACKAGE_PREFIX "${PACKAGE}-${PACKAGE_VERSION}") set(PACKAGE_PREFIX "${PROJECT_NAME}-${PROJECT_VERSION}")
set(DIST_FILE "${PACKAGE_PREFIX}.tar") set(DIST_FILE "${PACKAGE_PREFIX}.tar")
set(toplvl_DIST_local ${gnucash_DOCS} set(toplvl_DIST_local ${gnucash_DOCS}
@ -962,10 +954,6 @@ endif()
# ############################################################ # ############################################################
# Package creation rules # Package creation rules
set(CPACK_PACKAGE_VERSION_MAJOR "${GNUCASH_MAJOR_VERSION}")
set(CPACK_PACKAGE_VERSION_MINOR "${GNUCASH_MINOR_VERSION}")
set(CPACK_PACKAGE_VERSION "${VERSION}")
if(UNIX) if(UNIX)
set(CPACK_GENERATOR "TGZ") set(CPACK_GENERATOR "TGZ")
endif(UNIX) endif(UNIX)

View File

@ -24,8 +24,8 @@
/* Using GDK Quartz (not X11) */ /* Using GDK Quartz (not X11) */
#cmakedefine GDK_QUARTZ #cmakedefine GDK_QUARTZ
/* Name of our gettext-domain */ /* Name of our gettext-domain, needed for gi18n-lib.h */
#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@" #define GETTEXT_PACKAGE "@PROJECT_NAME@"
/* Cocoa/Nexstep/GnuStep framework */ /* Cocoa/Nexstep/GnuStep framework */
#cmakedefine GNC_PLATFORM_COCOA 1 #cmakedefine GNC_PLATFORM_COCOA 1
@ -57,18 +57,6 @@
/* Most recent stable GnuCash series */ /* Most recent stable GnuCash series */
#define GNUCASH_LATEST_STABLE_SERIES "@GNUCASH_LATEST_STABLE_SERIES@" #define GNUCASH_LATEST_STABLE_SERIES "@GNUCASH_LATEST_STABLE_SERIES@"
/* GnuCash Major version number */
#define GNUCASH_MAJOR_VERSION @GNUCASH_MAJOR_VERSION@
/* GnuCash Micro version number */
#define GNUCASH_MICRO_VERSION @GNUCASH_MICRO_VERSION@
/* GnuCash Minor version number */
#define GNUCASH_MINOR_VERSION @GNUCASH_MINOR_VERSION@
/* GnuCash Nano version number */
#define GNUCASH_NANO_VERSION @GNUCASH_NANO_VERSION@
/* GnuCash earliest compatible databaseversion number */ /* GnuCash earliest compatible databaseversion number */
#define GNUCASH_RESAVE_VERSION @GNUCASH_RESAVE_VERSION@ #define GNUCASH_RESAVE_VERSION @GNUCASH_RESAVE_VERSION@
@ -270,9 +258,6 @@
/* Define to the sub-directory where libtool stores uninstalled libraries. */ /* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/" #define LT_OBJDIR ".libs/"
/* Name of package */
#define PACKAGE "@PACKAGE@"
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" #define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
@ -282,14 +267,26 @@
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "@PACKAGE_STRING@" #define PACKAGE_STRING "@PACKAGE_STRING@"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "@PACKAGE_TARNAME@"
/* Define to the home page for this package. */ /* Define to the home page for this package. */
#define PACKAGE_URL "@PACKAGE_URL@" #define PACKAGE_URL "@PACKAGE_URL@"
/* Define to the version of this package. */ /* Name of project */
#define PACKAGE_VERSION "@PACKAGE_VERSION@" #define PROJECT_NAME "@PROJECT_NAME@"
/* Version number of package */
#define PROJECT_VERSION "@PROJECT_VERSION@"
/* GnuCash Major version number */
#define PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
/* GnuCash Micro version number */
#define PROJECT_VERSION_MICRO @PROJECT_VERSION_PATCH@
/* GnuCash Minor version number */
#define PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR@
/* GnuCash Nano version number */
#define PROJECT_VERSION_NANO @PROJECT_VERSION_TWEAK@
/* Define to necessary symbol if this constant uses a non-standard name on /* Define to necessary symbol if this constant uses a non-standard name on
your system. */ your system. */
@ -333,9 +330,6 @@
#endif #endif
/* Version number of package */
#define VERSION "@VERSION@"
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */ significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD #if defined AC_APPLE_UNIVERSAL_BUILD

View File

@ -342,7 +342,7 @@ gnc_embedded_window_new (const gchar *action_group_name,
/* Create menu and toolbar information */ /* Create menu and toolbar information */
priv->action_group = gtk_action_group_new (action_group_name); priv->action_group = gtk_action_group_new (action_group_name);
gtk_action_group_set_translation_domain(priv->action_group, GETTEXT_PACKAGE); gtk_action_group_set_translation_domain(priv->action_group, PROJECT_NAME);
gtk_action_group_add_actions (priv->action_group, action_entries, gtk_action_group_add_actions (priv->action_group, action_entries,
n_action_entries, user_data); n_action_entries, user_data);
gtk_ui_manager_insert_action_group (window->ui_merge, priv->action_group, 0); gtk_ui_manager_insert_action_group (window->ui_merge, priv->action_group, 0);

View File

@ -3154,7 +3154,7 @@ gnc_main_window_merge_actions (GncMainWindow *window,
priv = GNC_MAIN_WINDOW_GET_PRIVATE(window); priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
entry = g_new0 (MergedActionEntry, 1); entry = g_new0 (MergedActionEntry, 1);
entry->action_group = gtk_action_group_new (group_name); entry->action_group = gtk_action_group_new (group_name);
gtk_action_group_set_translation_domain (entry->action_group, GETTEXT_PACKAGE); gtk_action_group_set_translation_domain (entry->action_group, PROJECT_NAME);
gtk_action_group_add_actions (entry->action_group, actions, n_actions, data); gtk_action_group_add_actions (entry->action_group, actions, n_actions, data);
if (toggle_actions != NULL && n_toggle_actions > 0) if (toggle_actions != NULL && n_toggle_actions > 0)
{ {
@ -3604,7 +3604,7 @@ gnc_main_window_setup_window (GncMainWindow *window)
/* Create menu and toolbar information */ /* Create menu and toolbar information */
priv->action_group = gtk_action_group_new ("MainWindowActions"); priv->action_group = gtk_action_group_new ("MainWindowActions");
gtk_action_group_set_translation_domain (priv->action_group, GETTEXT_PACKAGE); gtk_action_group_set_translation_domain (priv->action_group, PROJECT_NAME);
gtk_action_group_add_actions (priv->action_group, gnc_menu_actions, gtk_action_group_add_actions (priv->action_group, gnc_menu_actions,
gnc_menu_n_actions, window); gnc_menu_n_actions, window);
gtk_action_group_add_toggle_actions (priv->action_group, gtk_action_group_add_toggle_actions (priv->action_group,

View File

@ -424,7 +424,7 @@ gnc_plugin_menu_additions_add_to_window (GncPlugin *plugin,
per_window.window = window; per_window.window = window;
per_window.ui_manager = window->ui_merge; per_window.ui_manager = window->ui_merge;
per_window.group = gtk_action_group_new ("MenuAdditions" ); per_window.group = gtk_action_group_new ("MenuAdditions" );
gtk_action_group_set_translation_domain (per_window.group, GETTEXT_PACKAGE); gtk_action_group_set_translation_domain (per_window.group, PROJECT_NAME);
per_window.merge_id = gtk_ui_manager_new_merge_id(window->ui_merge); per_window.merge_id = gtk_ui_manager_new_merge_id(window->ui_merge);
gtk_ui_manager_insert_action_group(window->ui_merge, per_window.group, 0); gtk_ui_manager_insert_action_group(window->ui_merge, per_window.group, 0);

View File

@ -997,7 +997,7 @@ gnc_plugin_page_create_action_group (GncPluginPage *page, const gchar *group_nam
priv = GNC_PLUGIN_PAGE_GET_PRIVATE(page); priv = GNC_PLUGIN_PAGE_GET_PRIVATE(page);
group = gtk_action_group_new(group_name); group = gtk_action_group_new(group_name);
gtk_action_group_set_translation_domain(group, GETTEXT_PACKAGE); gtk_action_group_set_translation_domain(group, PROJECT_NAME);
priv->action_group = group; priv->action_group = group;
return group; return group;
} }

View File

@ -14,6 +14,6 @@ Categories=Office;Finance;
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=GnuCash X-GNOME-Bugzilla-Product=GnuCash
X-GNOME-Bugzilla-Component=General X-GNOME-Bugzilla-Component=General
X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Bugzilla-Version=@PROJECT_VERSION@
X-GNOME-DocPath=gnucash/gnucash.xml X-GNOME-DocPath=gnucash/gnucash.xml
X-GNOME-FullName=GnuCash Finance Management X-GNOME-FullName=GnuCash Finance Management

View File

@ -1765,7 +1765,7 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, gnc_numeric new_endi
action_group = gtk_action_group_new ("ReconcileWindowActions"); action_group = gtk_action_group_new ("ReconcileWindowActions");
recnData->action_group = action_group; recnData->action_group = action_group;
gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE); gtk_action_group_set_translation_domain(action_group, PROJECT_NAME);
gtk_action_group_add_actions (action_group, recnWindow_actions, gtk_action_group_add_actions (action_group, recnWindow_actions,
recnWindow_n_actions, recnData); recnWindow_n_actions, recnData);
action = action =

View File

@ -1705,7 +1705,7 @@ recnWindow2WithBalance (GtkWidget *parent, Account *account,
action_group = gtk_action_group_new ("ReconcileWindowActions"); action_group = gtk_action_group_new ("ReconcileWindowActions");
recnData->action_group = action_group; recnData->action_group = action_group;
gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); gtk_action_group_set_translation_domain (action_group, PROJECT_NAME);
gtk_action_group_add_actions (action_group, recnWindow2_actions, gtk_action_group_add_actions (action_group, recnWindow2_actions,
recnWindow2_n_actions, recnData); recnWindow2_n_actions, recnData);
action = action =

View File

@ -438,7 +438,7 @@ gnc_parse_command_line(int *argc, char ***argv)
GError *error = NULL; GError *error = NULL;
GOptionContext *context = g_option_context_new (_("- GnuCash, accounting for personal and small business finance")); GOptionContext *context = g_option_context_new (_("- GnuCash, accounting for personal and small business finance"));
g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); g_option_context_add_main_entries (context, options, PROJECT_NAME);
g_option_context_add_group (context, gtk_get_option_group(FALSE)); g_option_context_add_group (context, gtk_get_option_group(FALSE));
if (!g_option_context_parse (context, argc, argv, &error)) if (!g_option_context_parse (context, argc, argv, &error))
{ {
@ -882,11 +882,11 @@ main(int argc, char ** argv)
setlocale (LC_ALL, "C"); setlocale (LC_ALL, "C");
} }
#endif #endif
bindtextdomain(GETTEXT_PACKAGE, localedir); bindtextdomain(PROJECT_NAME, localedir);
bindtextdomain("iso_4217", localedir); // For win32 to find currency name translations bindtextdomain("iso_4217", localedir); // For win32 to find currency name translations
bind_textdomain_codeset("iso_4217", "UTF-8"); bind_textdomain_codeset("iso_4217", "UTF-8");
textdomain(GETTEXT_PACKAGE); textdomain(PROJECT_NAME);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset(PROJECT_NAME, "UTF-8");
g_free(localedir); g_free(localedir);
gnc_parse_command_line(&argc, &argv); gnc_parse_command_line(&argc, &argv);

View File

@ -3,8 +3,8 @@
APPLICATION_ICON ICON DISCARDABLE "../data/pixmaps/gnucash-icon.ico" APPLICATION_ICON ICON DISCARDABLE "../data/pixmaps/gnucash-icon.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION @GNUCASH_MAJOR_VERSION@,@GNUCASH_MINOR_VERSION@,0,0 FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,0,0
PRODUCTVERSION @GNUCASH_MAJOR_VERSION@,@GNUCASH_MINOR_VERSION@,0,0 PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,0,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L FILEFLAGS 0x0L
FILEOS VOS__WINDOWS32 FILEOS VOS__WINDOWS32
@ -17,12 +17,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "GnuCash Development Team" VALUE "CompanyName", "GnuCash Development Team"
VALUE "FileDescription", "GnuCash Program File" VALUE "FileDescription", "GnuCash Program File"
VALUE "FileVersion", "@VERSION@" VALUE "FileVersion", "@PROJECT_VERSION@"
VALUE "InternalName", "gnucash" VALUE "InternalName", "gnucash"
VALUE "LegalCopyright", "©2018 GnuCash Development Team, Licence: GPL v2.0 or later" VALUE "LegalCopyright", "©2018 GnuCash Development Team, Licence: GPL v2.0 or later"
VALUE "OriginalFilename", "gnucash.exe" VALUE "OriginalFilename", "gnucash.exe"
VALUE "ProductName", "GnuCash Free Finance Manager" VALUE "ProductName", "GnuCash Free Finance Manager"
VALUE "ProductVersion", "@VERSION@" VALUE "ProductVersion", "@PROJECT_VERSION@"
END END
END END

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.business" path="/org/gnucash/dialogs/business/"> <schema id="org.gnucash.dialogs.business" path="/org/gnucash/dialogs/business/">
<child name="customer-search" schema="org.gnucash.dialogs.business.customer-search"/> <child name="customer-search" schema="org.gnucash.dialogs.business.customer-search"/>
<child name="employee-search" schema="org.gnucash.dialogs.business.employee-search"/> <child name="employee-search" schema="org.gnucash.dialogs.business.employee-search"/>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.checkprinting" path="/org/gnucash/dialogs/print-checks/"> <schema id="org.gnucash.dialogs.checkprinting" path="/org/gnucash/dialogs/print-checks/">
<key name="check-format-guid" type="s"> <key name="check-format-guid" type="s">
<default>''</default> <default>''</default>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.commodities" path="/org/gnucash/dialogs/commodities/"> <schema id="org.gnucash.dialogs.commodities" path="/org/gnucash/dialogs/commodities/">
<key name="include-iso" type="b"> <key name="include-iso" type="b">
<default>false</default> <default>false</default>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.export.csv" path="/org/gnucash/dialogs/export/csv/"> <schema id="org.gnucash.dialogs.export.csv" path="/org/gnucash/dialogs/export/csv/">
<key name="last-geometry" type="(iiii)"> <key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default> <default>(-1,-1,-1,-1)</default>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs" path="/org/gnucash/dialogs/"> <schema id="org.gnucash.dialogs" path="/org/gnucash/dialogs/">
<child name="account" schema="org.gnucash.dialogs.account"/> <child name="account" schema="org.gnucash.dialogs.account"/>
<child name="imap-editor" schema="org.gnucash.dialogs.imap-editor"/> <child name="imap-editor" schema="org.gnucash.dialogs.imap-editor"/>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.import.csv" path="/org/gnucash/dialogs/import/csv/"> <schema id="org.gnucash.dialogs.import.csv" path="/org/gnucash/dialogs/import/csv/">
<key name="last-geometry" type="(iiii)"> <key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default> <default>(-1,-1,-1,-1)</default>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.import.generic" path="/org/gnucash/dialogs/import/generic/"> <schema id="org.gnucash.dialogs.import.generic" path="/org/gnucash/dialogs/import/generic/">
<key name="enable-skip" type="b"> <key name="enable-skip" type="b">
<default>true</default> <default>true</default>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.import.qif" path="/org/gnucash/dialogs/import/qif/"> <schema id="org.gnucash.dialogs.import.qif" path="/org/gnucash/dialogs/import/qif/">
<key name="default-status-notcleared" type="b"> <key name="default-status-notcleared" type="b">
<default>true</default> <default>true</default>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.reconcile" path="/org/gnucash/dialogs/reconcile/"> <schema id="org.gnucash.dialogs.reconcile" path="/org/gnucash/dialogs/reconcile/">
<key name="check-cleared" type="b"> <key name="check-cleared" type="b">
<default>true</default> <default>true</default>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.sxs" path="/org/gnucash/dialogs/scheduled-trans/"> <schema id="org.gnucash.dialogs.sxs" path="/org/gnucash/dialogs/scheduled-trans/">
<child name="since-last-run" schema="org.gnucash.dialogs.sxs.since-last-run"/> <child name="since-last-run" schema="org.gnucash.dialogs.sxs.since-last-run"/>
<child name="transaction-editor" schema="org.gnucash.dialogs.sxs.transaction-editor"/> <child name="transaction-editor" schema="org.gnucash.dialogs.sxs.transaction-editor"/>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.totd" path="/org/gnucash/dialogs/tip-of-the-day/"> <schema id="org.gnucash.dialogs.totd" path="/org/gnucash/dialogs/tip-of-the-day/">
<key name="current-tip" type="i"> <key name="current-tip" type="i">
<default>0</default> <default>0</default>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.general.finance-quote" path="/org/gnucash/general/finance-quote/"> <schema id="org.gnucash.general.finance-quote" path="/org/gnucash/general/finance-quote/">
<key name="alphavantage-api-key" type="s"> <key name="alphavantage-api-key" type="s">
<default>''</default> <default>''</default>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash" path="/org/gnucash/"> <schema id="org.gnucash" path="/org/gnucash/">
<child name="general" schema="org.gnucash.general"/> <child name="general" schema="org.gnucash.general"/>
<child name="dev" schema="org.gnucash.dev"/> <child name="dev" schema="org.gnucash.dev"/>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.history" path="/org/gnucash/history/"> <schema id="org.gnucash.history" path="/org/gnucash/history/">
<key name="maxfiles" type="i"> <key name="maxfiles" type="i">
<default>4</default> <default>4</default>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.warnings" path="/org/gnucash/warnings/"> <schema id="org.gnucash.warnings" path="/org/gnucash/warnings/">
<child name="permanent" schema="org.gnucash.warnings.permanent"/> <child name="permanent" schema="org.gnucash.warnings.permanent"/>
<child name="temporary" schema="org.gnucash.warnings.temporary"/> <child name="temporary" schema="org.gnucash.warnings.temporary"/>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.window.pages.account-tree.summary" path="/org/gnucash/window/pages/account-tree/summary/"> <schema id="org.gnucash.window.pages.account-tree.summary" path="/org/gnucash/window/pages/account-tree/summary/">
<key name="grand-total" type="b"> <key name="grand-total" type="b">
<default>true</default> <default>true</default>

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.window.pages" path="/org/gnucash/window/pages/account-tree/"> <schema id="org.gnucash.window.pages" path="/org/gnucash/window/pages/account-tree/">
<key name="account-code-visible" type="b"> <key name="account-code-visible" type="b">
<default>false</default> <default>false</default>

View File

@ -169,7 +169,7 @@ gnc_AB_BANKING_new(void)
registration was requested and is managed by cstim). The function call was registration was requested and is managed by cstim). The function call was
introduced in aqbanking-5.99.25 and aqbanking-5.7.9. */ introduced in aqbanking-5.99.25 and aqbanking-5.7.9. */
AB_Banking_RuntimeConfig_SetCharValue(api, "fintsRegistrationKey", "412748A1836CDD07181CE1910"); AB_Banking_RuntimeConfig_SetCharValue(api, "fintsRegistrationKey", "412748A1836CDD07181CE1910");
AB_Banking_RuntimeConfig_SetCharValue(api, "fintsApplicationVersionString", PACKAGE_VERSION); AB_Banking_RuntimeConfig_SetCharValue(api, "fintsApplicationVersionString", PROJECT_VERSION);
#endif #endif
#ifndef AQBANKING6 #ifndef AQBANKING6

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.ab-initial" path="/org/gnucash/dialogs/ab-initial/"> <schema id="org.gnucash.dialogs.ab-initial" path="/org/gnucash/dialogs/ab-initial/">
<key name="last-geometry" type="(iiii)"> <key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default> <default>(-1,-1,-1,-1)</default>

View File

@ -2079,7 +2079,7 @@ CsvImpTransAssist::assist_summary_page_prepare ()
// FIXME Rather than passing a locale generator below we probably should set std::locale::global appropriately somewhere. // FIXME Rather than passing a locale generator below we probably should set std::locale::global appropriately somewhere.
bl::generator gen; bl::generator gen;
gen.add_messages_path(gnc_path_get_localedir()); gen.add_messages_path(gnc_path_get_localedir());
gen.add_messages_domain(GETTEXT_PACKAGE); gen.add_messages_domain(PROJECT_NAME);
auto text = std::string("<span size=\"medium\"><b>"); auto text = std::string("<span size=\"medium\"><b>");
try try

View File

@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@"> <schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.import.ofx" path="/org/gnucash/dialogs/import/ofx/"> <schema id="org.gnucash.dialogs.import.ofx" path="/org/gnucash/dialogs/import/ofx/">
<key name="last-path" type="s"> <key name="last-path" type="s">
<default>''</default> <default>''</default>

View File

@ -885,7 +885,7 @@ void gnc_gsettings_version_upgrade (void)
/* Use versioning to ensure this routine will only sync once for each /* Use versioning to ensure this routine will only sync once for each
* superseded setting */ * superseded setting */
int old_maj_min = gnc_gsettings_get_int (GNC_PREFS_GROUP_GENERAL, GNC_PREF_VERSION); int old_maj_min = gnc_gsettings_get_int (GNC_PREFS_GROUP_GENERAL, GNC_PREF_VERSION);
int cur_maj_min = GNUCASH_MAJOR_VERSION * 100 + GNUCASH_MINOR_VERSION; int cur_maj_min = PROJECT_VERSION_MAJOR * 100 + PROJECT_VERSION_MINOR;
/* Migrate preferences from gconf to gsettings */ /* Migrate preferences from gconf to gsettings */
if (!gnc_gsettings_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_MIGRATE_PREFS_DONE)) if (!gnc_gsettings_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_MIGRATE_PREFS_DONE))

View File

@ -36,7 +36,7 @@ extern "C"
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#ifdef GNUCASH_MAJOR_VERSION #ifdef PROJECT_VERSION_MAJOR
#ifndef HAVE_STRPTIME #ifndef HAVE_STRPTIME
#include "strptime.h" #include "strptime.h"
#endif #endif

View File

@ -591,7 +591,7 @@ static std::string migrate_gnc_datahome()
bl::generator gen; bl::generator gen;
gen.add_messages_path(gnc_path_get_datadir()); gen.add_messages_path(gnc_path_get_datadir());
gen.add_messages_domain(PACKAGE); gen.add_messages_domain(PROJECT_NAME);
std::stringstream migration_msg; std::stringstream migration_msg;
migration_msg.imbue(gnc_get_locale()); migration_msg.imbue(gnc_get_locale());
@ -737,7 +737,7 @@ static std::string migrate_gnc_datahome()
#if defined G_OS_WIN32 ||defined MAC_INTEGRATION #if defined G_OS_WIN32 ||defined MAC_INTEGRATION
constexpr auto path_package = PACKAGE_NAME; constexpr auto path_package = PACKAGE_NAME;
#else #else
constexpr auto path_package = PACKAGE; constexpr auto path_package = PROJECT_NAME;
#endif #endif
// Initialize the user's config directory for gnucash // Initialize the user's config directory for gnucash

View File

@ -116,7 +116,7 @@ gnc_prefs_set_file_retention_days(gint days)
guint guint
gnc_prefs_get_long_version() gnc_prefs_get_long_version()
{ {
return GNUCASH_MAJOR_VERSION * 1000000 + GNUCASH_MINOR_VERSION; return PROJECT_VERSION_MAJOR * 1000000 + PROJECT_VERSION_MINOR;
} }
gulong gnc_prefs_register_cb (const char *group, gulong gnc_prefs_register_cb (const char *group,

View File

@ -34,7 +34,7 @@
const char *gnc_version(void) const char *gnc_version(void)
{ {
return VERSION; return PROJECT_VERSION;
} }
const char *gnc_build_id(void) const char *gnc_build_id(void)
@ -64,5 +64,5 @@ const char *gnc_vcs_rev_date(void)
const int gnc_gnucash_major_version(void) const int gnc_gnucash_major_version(void)
{ {
return GNUCASH_MAJOR_VERSION; return PROJECT_VERSION_MAJOR;
} }

View File

@ -42,19 +42,19 @@ usr_confpath_strings strs2[] =
{ {
{ {
0, "gnc_build_userdata_path", 0, "gnc_build_userdata_path",
PACKAGE PROJECT_NAME
}, },
{ {
1, "gnc_build_book_path", 1, "gnc_build_book_path",
PACKAGE G_DIR_SEPARATOR_S "books" PROJECT_NAME G_DIR_SEPARATOR_S "books"
}, },
{ {
2, "gnc_build_translog_path", 2, "gnc_build_translog_path",
PACKAGE G_DIR_SEPARATOR_S "translog" PROJECT_NAME G_DIR_SEPARATOR_S "translog"
}, },
{ {
3, "gnc_build_data_path", 3, "gnc_build_data_path",
PACKAGE G_DIR_SEPARATOR_S "data" PROJECT_NAME G_DIR_SEPARATOR_S "data"
}, },
{ 0, NULL, NULL }, { 0, NULL, NULL },
}; };

View File

@ -62,7 +62,7 @@ usr_confpath_strings strs2[] =
#if defined G_OS_WIN32 ||defined MAC_INTEGRATION #if defined G_OS_WIN32 ||defined MAC_INTEGRATION
const char *path_package = PACKAGE_NAME; const char *path_package = PACKAGE_NAME;
#else #else
const char *path_package = PACKAGE; const char *path_package = PROJECT_NAME;
#endif #endif

View File

@ -22,8 +22,8 @@ set(UPDATED_MONTH "${CURRENT_MONTH} ${CURRENT_YEAR}")
set(VERSION_TEXI_IN set(VERSION_TEXI_IN
"@set UPDATED ${UPDATED} "@set UPDATED ${UPDATED}
@set UPDATED-MONTH ${UPDATED_MONTH} @set UPDATED-MONTH ${UPDATED_MONTH}
@set EDITION ${VERSION} @set EDITION ${PROJECT_VERSION}
@set VERSION ${VERSION} @set VERSION ${PROJECT_VERSION}
") ")
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.texi ${VERSION_TEXI_IN}) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.texi ${VERSION_TEXI_IN})

View File

@ -55,7 +55,7 @@ up to you to pass a suitable entity.
#define GNC_ADDRESS_H_ #define GNC_ADDRESS_H_
#include "qof.h" #include "qof.h"
#ifdef GNUCASH_MAJOR_VERSION #ifdef PROJECT_VERSION_MAJOR
#include "gncBusiness.h" #include "gncBusiness.h"
#endif #endif

View File

@ -35,7 +35,7 @@ typedef struct _gncBillTerm GncBillTerm;
typedef struct _gncBillTermClass GncBillTermClass; typedef struct _gncBillTermClass GncBillTermClass;
#include "qof.h" #include "qof.h"
#ifdef GNUCASH_MAJOR_VERSION #ifdef PROJECT_VERSION_MAJOR
#include "gncBusiness.h" #include "gncBusiness.h"
#endif #endif
#define GNC_ID_BILLTERM "gncBillTerm" #define GNC_ID_BILLTERM "gncBillTerm"

View File

@ -37,7 +37,7 @@
#include "gncAddressP.h" #include "gncAddressP.h"
#include "gncBillTermP.h" #include "gncBillTermP.h"
#include "gncInvoice.h" #include "gncInvoice.h"
#ifdef GNUCASH_MAJOR_VERSION #ifdef PROJECT_VERSION_MAJOR
#include "gncBusiness.h" #include "gncBusiness.h"
#endif #endif

View File

@ -49,7 +49,7 @@ typedef enum
typedef GList AccountValueList; typedef GList AccountValueList;
#ifdef GNUCASH_MAJOR_VERSION #ifdef PROJECT_VERSION_MAJOR
#include "gncBusiness.h" #include "gncBusiness.h"
#endif #endif
#include "gncInvoice.h" #include "gncInvoice.h"

View File

@ -576,7 +576,7 @@ gboolean gncJobRegister (void)
{ JOB_ACTIVE, QOF_TYPE_BOOLEAN, (QofAccessFunc)gncJobGetActive, (QofSetterFunc)gncJobSetActive }, { JOB_ACTIVE, QOF_TYPE_BOOLEAN, (QofAccessFunc)gncJobGetActive, (QofSetterFunc)gncJobSetActive },
{ JOB_REFERENCE, QOF_TYPE_STRING, (QofAccessFunc)gncJobGetReference, (QofSetterFunc)gncJobSetReference }, { JOB_REFERENCE, QOF_TYPE_STRING, (QofAccessFunc)gncJobGetReference, (QofSetterFunc)gncJobSetReference },
{ JOB_RATE, QOF_TYPE_NUMERIC, (QofAccessFunc)gncJobGetRate, (QofSetterFunc)gncJobSetRate }, { JOB_RATE, QOF_TYPE_NUMERIC, (QofAccessFunc)gncJobGetRate, (QofSetterFunc)gncJobSetRate },
#ifdef GNUCASH_MAJOR_VERSION #ifdef PROJECT_VERSION_MAJOR
{ JOB_OWNER, GNC_ID_OWNER, (QofAccessFunc)gncJobGetOwner, NULL }, { JOB_OWNER, GNC_ID_OWNER, (QofAccessFunc)gncJobGetOwner, NULL },
#else #else
{ JOB_OWNER, QOF_TYPE_CHOICE, (QofAccessFunc)qofJobGetOwner, (QofSetterFunc)qofJobSetOwner }, { JOB_OWNER, QOF_TYPE_CHOICE, (QofAccessFunc)qofJobGetOwner, (QofSetterFunc)qofJobSetOwner },
@ -597,7 +597,7 @@ gboolean gncJobRegister (void)
} }
qof_class_register (_GNC_MOD_NAME, (QofSortFunc)gncJobCompare, params); qof_class_register (_GNC_MOD_NAME, (QofSortFunc)gncJobCompare, params);
#ifdef GNUCASH_MAJOR_VERSION #ifdef PROJECT_VERSION_MAJOR
qofJobGetOwner(NULL); qofJobGetOwner(NULL);
qofJobSetOwner(NULL, NULL); qofJobSetOwner(NULL, NULL);
#endif #endif

View File

@ -109,7 +109,7 @@ QofBackend::register_backend(const char* directory, const char* module_name)
g_free (fullpath); g_free (fullpath);
if (!backend) if (!backend)
{ {
PINFO ("%s: %s\n", PACKAGE, g_module_error ()); PINFO ("%s: %s\n", PROJECT_NAME, g_module_error ());
return false; return false;
} }
void (*module_init_func)(void); void (*module_init_func)(void);

View File

@ -149,9 +149,9 @@ if(BUILDING_FROM_VCS)
-D TOP_SRC_DIR=${CMAKE_SOURCE_DIR} -D TOP_SRC_DIR=${CMAKE_SOURCE_DIR}
-D PO_SRC_DIR=${CMAKE_CURRENT_SOURCE_DIR} -D PO_SRC_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-D PO_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR} -D PO_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}
-D PACKAGE=${PACKAGE} -D PROJECT_NAME=${PROJECT_NAME}
-D PACKAGE_NAME=${PACKAGE_NAME} -D PACKAGE_NAME=${PACKAGE_NAME}
-D PACKAGE_VERSION=${PACKAGE_VERSION} -D PROJECT_VERSION=${PROJECT_VERSION}
-D XGETTEXT=${XGETTEXT} -D XGETTEXT=${XGETTEXT}
-P ${CMAKE_CURRENT_SOURCE_DIR}/gnucash-pot.cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/gnucash-pot.cmake
DEPENDS ${gnucash_pot_depends} DEPENDS ${gnucash_pot_depends}

View File

@ -1,7 +1,7 @@
# Makefile variables for PO directory in any package using GNU gettext. # Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name. # Usually the message domain is the same as the package name.
DOMAIN = $(PACKAGE) DOMAIN = $(PROJECT_NAME)
# These two variables depend on the location of this directory. # These two variables depend on the location of this directory.
subdir = po subdir = po

View File

@ -23,17 +23,17 @@ then
exit 1; exit 1;
fi fi
# Note: Line 3: PACKAGE and probably a few other variables are hardcoded # Note: Line 3: PROJECT and probably a few other variables are hardcoded
cat <<! cat <<!
# SOME DESCRIPTIVE TITLE. (Glossary) # SOME DESCRIPTIVE TITLE. (Glossary)
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # Copyright (C) YEAR THE PROJECT'S COPYRIGHT HOLDER
# This file is distributed under the same license as the GnuCash package. # This file is distributed under the same license as the GnuCash package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"POT-Creation-Date: `date +'%Y-%m-%d %H:%M%z'`\n" "POT-Creation-Date: `date +'%Y-%m-%d %H:%M%z'`\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

View File

@ -1,8 +1,8 @@
execute_process( execute_process(
COMMAND ${XGETTEXT} --add-comments=Translators COMMAND ${XGETTEXT} --add-comments=Translators
--directory=${TOP_SRC_DIR} --directory=${TOP_SRC_DIR}
--default-domain=${PACKAGE} --default-domain=${PROJECT_NAME}
--output=${PACKAGE}.pot --output=${PROJECT_NAME}.pot
--files-from=${PO_SRC_DIR}/POTFILES.in --files-from=${PO_SRC_DIR}/POTFILES.in
--from-code=UTF-8 --from-code=UTF-8
--flag=g_strdup_printf:1:c-format --flag=g_strdup_printf:1:c-format
@ -30,7 +30,7 @@ execute_process(
--keyword=translate:1,2,3t --keyword=translate:1,2,3t
--keyword=translate:1c,2,3,4t --keyword=translate:1c,2,3,4t
--package-name=${PACKAGE_NAME} --package-name=${PACKAGE_NAME}
--package-version=${PACKAGE_VERSION} --package-version=${PROJECT_VERSION}
--msgid-bugs-address=https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash&component=Translations --msgid-bugs-address=https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash&component=Translations
WORKING_DIRECTORY ${PO_BIN_DIR} WORKING_DIRECTORY ${PO_BIN_DIR}
RESULT_VARIABLE GNUCASH_POT_RESULT RESULT_VARIABLE GNUCASH_POT_RESULT

View File

@ -1,6 +1,6 @@
# GNUCash translations for Manipuri language using Bengali Script" # GNUCash translations for Manipuri language using Bengali Script"
# Copyright (C) 2015. # Copyright (C) 2015.
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the GnuCash package.
# Chandrakant Dhutadmal <cpdhutadmal@yahoo.com>, 2015. # Chandrakant Dhutadmal <cpdhutadmal@yahoo.com>, 2015.
# #
msgid "" msgid ""

View File

@ -1,5 +1,5 @@
# translation of gnucash2.ne.po to Nepali # translation of gnucash2.ne.po to Nepali
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the GnuCash package.
# Copyright (C) YEAR Gnumatic, Inc. # Copyright (C) YEAR Gnumatic, Inc.
# Pawan Chitrakar <pchitrakar@gmail.com>, 2006. # Pawan Chitrakar <pchitrakar@gmail.com>, 2006.
# Jyotshna Shrestha <jyotshna@mpp.org.np>, 2006. # Jyotshna Shrestha <jyotshna@mpp.org.np>, 2006.