MINOR_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f2 -d.`
MICRO_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f3 -d.`
EXTRA_VERSION=`echo $GIT_VERSION | cut -f2 -d-`
-HASH_VERSION=`echo $GIT_VERSION | cut -f3 -d-`
-DIRTY_VERSION=`echo $GIT_VERSION | cut -f4 -d-`
if test \( "x$EXTRA_VERSION" != "x" \); then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}git${EXTRA_VERSION}
CFLAGS="$CFLAGS -Wall"
if test $USE_MAINTAINER_MODE = yes; then
- CFLAGS="-g -Wall -Wno-pointer-sign"
+ CFLAGS="-g -Wall -Wno-pointer-sign -DUSE_MAINTAINER_MODE"
fi
pthread_name=
(((guint32)c) << 8) | ((guint32)d) )
#define PACKAGE "@PACKAGE@"
+#define PACKAGE_FRIENDLY "Claws Mail"
#define VERSION "@VERSION@"
-#define PROG_VERSION "Claws Mail "VERSION
+#define RELEASE_VERSION "@MAJOR_VERSION@.@MINOR_VERSION@.@MICRO_VERSION@"
+#define PROG_VERSION PACKAGE_FRIENDLY" "VERSION_GIT_FULL
+#ifdef USE_MAINTAINER_MODE
+#define PROG_VERSION_FRIENDLY PROG_VERSION
+#else
+#define PROG_VERSION_FRIENDLY PACKAGE_FRIENDLY" "RELEASE_VERSION
+#endif
#define VERSION_NUMERIC MAKE_NUMERIC_VERSION(@MAJOR_VERSION@, @MINOR_VERSION@, \
@MICRO_VERSION@, @EXTRA_VERSION@)
#define VERSION_GIT_FULL "@GIT_VERSION@"
-#define VERSION_GIT_HASH "@HASH_VERSION@"
-
#endif /* __VERSION_H__ */
/* main window */
window = GTK_WIDGET(gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow"));
- gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
+ gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION_FRIENDLY);
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
#ifdef GENERIC_UMPC
prefs_common.layout_mode = SMALL_LAYOUT;
: _("none"));
if (cur_account)
- buf = g_strdup_printf("%s - %s", ac_name, PROG_VERSION);
+ buf = g_strdup_printf("%s - %s", ac_name, PROG_VERSION_FRIENDLY);
else
- buf = g_strdup(PROG_VERSION);
+ buf = g_strdup(PROG_VERSION_FRIENDLY);
gtk_window_set_title(GTK_WINDOW(mainwin->window), buf);
g_free(buf);