mirror of
https://github.com/profanity-im/profanity.git
synced 2024-06-23 21:45:30 +00:00
Use git revision in development strings
This commit is contained in:
parent
90d5df9ef7
commit
ee8ff948bf
|
@ -22,6 +22,10 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_GIT_VERSION
|
||||||
|
#include "gitversion.c"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -615,7 +619,11 @@ _init(const int disable_tls, char *log_level)
|
||||||
log_level_t prof_log_level = log_level_from_string(log_level);
|
log_level_t prof_log_level = log_level_from_string(log_level);
|
||||||
log_init(prof_log_level);
|
log_init(prof_log_level);
|
||||||
if (strcmp(PACKAGE_STATUS, "development") == 0) {
|
if (strcmp(PACKAGE_STATUS, "development") == 0) {
|
||||||
log_info("Starting Profanity (%sdev)...", PACKAGE_VERSION);
|
#ifdef HAVE_GIT_VERSION
|
||||||
|
log_info("Starting Profanity (%sdev.%s.%s)...", PACKAGE_VERSION, PROF_GIT_BRANCH, PROF_GIT_REVISION);
|
||||||
|
#else
|
||||||
|
log_info("Starting Profanity (%sdev)...", PACKAGE_VERSION);
|
||||||
|
#endif
|
||||||
} else {
|
} else {
|
||||||
log_info("Starting Profanity (%s)...", PACKAGE_VERSION);
|
log_info("Starting Profanity (%s)...", PACKAGE_VERSION);
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,6 +22,10 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_GIT_VERSION
|
||||||
|
#include "gitversion.c"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#ifdef HAVE_LIBXSS
|
#ifdef HAVE_LIBXSS
|
||||||
|
@ -1375,7 +1379,14 @@ _ui_draw_win_title(void)
|
||||||
g_string_append(version_str, " ");
|
g_string_append(version_str, " ");
|
||||||
g_string_append(version_str, PACKAGE_VERSION);
|
g_string_append(version_str, PACKAGE_VERSION);
|
||||||
if (strcmp(PACKAGE_STATUS, "development") == 0) {
|
if (strcmp(PACKAGE_STATUS, "development") == 0) {
|
||||||
|
#ifdef HAVE_GIT_VERSION
|
||||||
|
g_string_append(version_str, "dev.");
|
||||||
|
g_string_append(version_str, PROF_GIT_BRANCH);
|
||||||
|
g_string_append(version_str, ".");
|
||||||
|
g_string_append(version_str, PROF_GIT_REVISION);
|
||||||
|
#else
|
||||||
g_string_append(version_str, "dev");
|
g_string_append(version_str, "dev");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,10 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_GIT_VERSION
|
||||||
|
#include "gitversion.c"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
@ -238,7 +242,14 @@ caps_create_query_response_stanza(xmpp_ctx_t * const ctx)
|
||||||
GString *name_str = g_string_new("Profanity ");
|
GString *name_str = g_string_new("Profanity ");
|
||||||
g_string_append(name_str, PACKAGE_VERSION);
|
g_string_append(name_str, PACKAGE_VERSION);
|
||||||
if (strcmp(PACKAGE_STATUS, "development") == 0) {
|
if (strcmp(PACKAGE_STATUS, "development") == 0) {
|
||||||
|
#ifdef HAVE_GIT_VERSION
|
||||||
|
g_string_append(name_str, "dev.");
|
||||||
|
g_string_append(name_str, PROF_GIT_BRANCH);
|
||||||
|
g_string_append(name_str, ".");
|
||||||
|
g_string_append(name_str, PROF_GIT_REVISION);
|
||||||
|
#else
|
||||||
g_string_append(name_str, "dev");
|
g_string_append(name_str, "dev");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
xmpp_stanza_set_attribute(identity, "name", name_str->str);
|
xmpp_stanza_set_attribute(identity, "name", name_str->str);
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,10 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_GIT_VERSION
|
||||||
|
#include "gitversion.c"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
@ -236,7 +240,14 @@ _iq_handle_version_get(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
|
||||||
xmpp_stanza_t *version_txt = xmpp_stanza_new(ctx);
|
xmpp_stanza_t *version_txt = xmpp_stanza_new(ctx);
|
||||||
GString *version_str = g_string_new(PACKAGE_VERSION);
|
GString *version_str = g_string_new(PACKAGE_VERSION);
|
||||||
if (strcmp(PACKAGE_STATUS, "development") == 0) {
|
if (strcmp(PACKAGE_STATUS, "development") == 0) {
|
||||||
|
#ifdef HAVE_GIT_VERSION
|
||||||
|
g_string_append(version_str, "dev.");
|
||||||
|
g_string_append(version_str, PROF_GIT_BRANCH);
|
||||||
|
g_string_append(version_str, ".");
|
||||||
|
g_string_append(version_str, PROF_GIT_REVISION);
|
||||||
|
#else
|
||||||
g_string_append(version_str, "dev");
|
g_string_append(version_str, "dev");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
xmpp_stanza_set_text(version_txt, version_str->str);
|
xmpp_stanza_set_text(version_txt, version_str->str);
|
||||||
xmpp_stanza_add_child(version, version_txt);
|
xmpp_stanza_add_child(version, version_txt);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user