debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch: Add a version (0.1 initially) with a new --version option.

Browse source 
We're planning to do actual releases soon, so we need a version
number to put into the tar file.
This commit is contained in:
Carl Worth 2010-04-02 11:55:09 -07:00
parent 9d9aeb7c71
commit b2a9fcd5cf
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile.local
View file

@ -1,3 +1,15 @@
# Here's the (hopefully simple) versioning scheme.
#
# Releases of notmuch have a two-digit version (0.1, 0.2, etc.). We
# increment the second digit for each release and increment the first
# digit when we reach particularly major milestones of usability.
#
# Between releases, (such as when compiling notmuch from the git
# repository), we add a third digit, (0.1.1, 0.1.2, etc.), and
# increment it occasionally, (such as after a big batch of commits are
# merged.
NOTMUCH_VERSION=0.1
# Get settings from the output of configure by running it to generate # Get settings from the output of configure by running it to generate
# Makefile.config if it doesn't exist yet. And add Makefile.config to # Makefile.config if it doesn't exist yet. And add Makefile.config to
# our global dependency list. # our global dependency list.
@ -18,7 +30,7 @@ extra_cflags :=
extra_cxxflags := extra_cxxflags :=
# Smash together user's values with our extra values # Smash together user's values with our extra values
FINAL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags) FINAL_CFLAGS = -DNOTMUCH_VERSION=$(NOTMUCH_VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS) FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)

3
notmuch-client.h
View file

@ -51,6 +51,9 @@
#define unused(x) x __attribute__ ((unused)) #define unused(x) x __attribute__ ((unused))
#define STRINGIFY(s) STRINGIFY_(s)
#define STRINGIFY_(s) #s
/* There's no point in continuing when we've detected that we've done /* There's no point in continuing when we've detected that we've done
* something wrong internally (as opposed to the user passing in a * something wrong internally (as opposed to the user passing in a
* bogus value). * bogus value).

6
notmuch.c
View file

@ -309,6 +309,7 @@ usage (FILE *out)
fprintf (out, fprintf (out,
"Usage: notmuch --help\n" "Usage: notmuch --help\n"
" notmuch --version\n"
" notmuch <command> [args...]\n"); " notmuch <command> [args...]\n");
fprintf (out, "\n"); fprintf (out, "\n");
fprintf (out, "Where <command> and [args...] are as follows:\n"); fprintf (out, "Where <command> and [args...] are as follows:\n");
@ -462,6 +463,11 @@ main (int argc, char *argv[])
if (STRNCMP_LITERAL (argv[1], "--help") == 0) if (STRNCMP_LITERAL (argv[1], "--help") == 0)
return notmuch_help_command (NULL, 0, NULL); return notmuch_help_command (NULL, 0, NULL);
if (STRNCMP_LITERAL (argv[1], "--version") == 0) {
printf ("notmuch version " STRINGIFY(NOTMUCH_VERSION) "\n");
return 0;
}
for (i = 0; i < ARRAY_SIZE (commands); i++) { for (i = 0; i < ARRAY_SIZE (commands); i++) {
command = &commands[i]; command = &commands[i];