add a version tag

diff --git a/Makefile b/Makefile
index 8c4a4087787d6fdbf818fb7e9d882720d0da447c..0d18bae5b1a1547e7d7baae7d555b41d74b4d7c7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,13 @@
 #   getprogname
 #
 
+version=       $(shell sh get-version.sh)
+
 CC?=           gcc
 CFLAGS?=       -O -pipe
 LDADD?=                -lssl -lcrypto -lresolv
 
-CFLAGS+=       -Wall
+CFLAGS+=       -Wall -DDMA_VERSION='"${version}"'
 
 INSTALL?=      install -p
 CHGRP?=                chgrp

diff --git a/VERSION b/VERSION
new file mode 100644 (file)
index 0000000..2b256fd
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+v0.0

diff --git a/dma.h b/dma.h
index 8422b89d4b18f02b3531941eb63fdb03092b80cd..fd92980a42ca6fcafa26d547929ec4c243ac7c20 100644 (file)
--- a/dma.h
+++ b/dma.h
@@ -44,7 +44,7 @@
 #include <openssl/ssl.h>
 #include <netdb.h>
 
-#define VERSION        "DragonFly Mail Agent"
+#define VERSION        "DragonFly Mail Agent " DMA_VERSION
 
 #define BUF_SIZE       2048
 #define MIN_RETRY      300             /* 5 minutes */

diff --git a/get-version.sh b/get-version.sh
new file mode 100644 (file)
index 0000000..aecc333
--- /dev/null
+++ b/get-version.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+gitver=$(git describe 2>/dev/null | tr - .)
+filever=$(cat VERSION)
+
+version=${gitver}
+: ${version:=$filever}
+
+echo "$version"