Include proper version string
This commit is contained in:
parent
9add3b7667
commit
fda25171b2
2 changed files with 11 additions and 7 deletions
2
Makefile
2
Makefile
|
|
@ -1,11 +1,13 @@
|
||||||
GITREV ?= $(shell git describe --dirty --always)
|
GITREV ?= $(shell git describe --dirty --always)
|
||||||
BLDDATE ?= $(shell date -I)
|
BLDDATE ?= $(shell date -I)
|
||||||
CR_YEAR ?= $(shell date +%Y)
|
CR_YEAR ?= $(shell date +%Y)
|
||||||
|
VERSION ?= "v0.1.2"
|
||||||
|
|
||||||
CFLAGS ?= -Wall -Wextra -Wpedantic -O2 -std=gnu99
|
CFLAGS ?= -Wall -Wextra -Wpedantic -O2 -std=gnu99
|
||||||
CFLAGS += -DGITREV='"$(GITREV)"'
|
CFLAGS += -DGITREV='"$(GITREV)"'
|
||||||
CFLAGS += -DBLDDATE='"$(BLDDATE)"'
|
CFLAGS += -DBLDDATE='"$(BLDDATE)"'
|
||||||
CFLAGS += -DCR_YEAR='"$(CR_YEAR)"'
|
CFLAGS += -DCR_YEAR='"$(CR_YEAR)"'
|
||||||
|
CFLAGS += -DVERSION='$(VERSION)'
|
||||||
|
|
||||||
# Soon...
|
# Soon...
|
||||||
# CFLAGS += $(shell pkg-config --cflags libudev)
|
# CFLAGS += $(shell pkg-config --cflags libudev)
|
||||||
|
|
|
||||||
14
writeimg.c
14
writeimg.c
|
|
@ -10,10 +10,12 @@
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#ifdef GITREV
|
#ifndef GITREV
|
||||||
#define VERSION GITREV
|
#define GITREV "unknown"
|
||||||
#else
|
#endif
|
||||||
#define VERSION "1.0.0"
|
|
||||||
|
#ifndef VERSION
|
||||||
|
#define VERSION "unknown"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CR_YEAR
|
#ifndef CR_YEAR
|
||||||
|
|
@ -127,11 +129,11 @@ static const struct option longopts[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
printf("%s version %s\n", basename(argv[0]), VERSION);
|
printf("%s %s, Rev. %s\n", basename(argv[0]), VERSION, GITREV);
|
||||||
|
fprintf(stdout, copyright, CR_YEAR);
|
||||||
#ifdef BLDDATE
|
#ifdef BLDDATE
|
||||||
printf("Build date: %s\n", BLDDATE);
|
printf("Build date: %s\n", BLDDATE);
|
||||||
#endif
|
#endif
|
||||||
fprintf(stdout, copyright, CR_YEAR);
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
|
|
||||||
/* Line buffering, system allocated */
|
/* Line buffering, system allocated */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue