From 81ccba8b54718c3f198699a81e26b07d8b7ae643 Mon Sep 17 00:00:00 2001
From: Lucas Christian <lucas@lucasec.com>
Date: Sat, 16 Jul 2016 23:21:33 -0700
Subject: Update version tagging for git

---
 .gitignore      |  4 ++++
 .hgignore       |  6 ------
 Makefile        | 14 +++++++-------
 mdns-repeater.c |  2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 .hgignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..cea2d46
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.o
+_version
+mdns-repeater
+mdns-repeater-*.zip 
diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index 4d9b3b2..0000000
--- a/.hgignore
+++ /dev/null
@@ -1,6 +0,0 @@
-syntax: glob
-
-*.o
-_hgversion
-mdns-repeater
-mdns-repeater-*.zip 
diff --git a/Makefile b/Makefile
index a04f707..7d57abf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 # Makefile for mdns-repeater
 
 
-ZIP_NAME = mdns-repeater-$(HGVERSION)
+ZIP_NAME = mdns-repeater-$(VCSVERSION)
 
 ZIP_FILES = mdns-repeater	\
 			README.txt		\
 			LICENSE.txt
 
-HGVERSION=$(shell hg parents --template "{latesttag}.{latesttagdistance}")
+VCSVERSION=$(shell git describe --dirty="-SNAPSHOT" --always --tags)
 
 CFLAGS=-Wall
 
@@ -18,13 +18,13 @@ CFLAGS+= -Os
 LDFLAGS+= -s
 endif
 
-CFLAGS+= -DHGVERSION="\"${HGVERSION}\""
+CFLAGS+= -DVCSVERSION="\"${VCSVERSION}\""
 
 .PHONY: all clean
 
 all: mdns-repeater
 
-mdns-repeater.o: _hgversion
+mdns-repeater.o: _version
 
 mdns-repeater: mdns-repeater.o
 
@@ -39,12 +39,12 @@ zip: mdns-repeater
 
 # version checking rules
 .PHONY: dummy
-_hgversion: dummy
-	@echo $(HGVERSION) | cmp -s $@ - || echo $(HGVERSION) > $@
+_version: dummy
+	@echo $(VCSVERSION) | cmp -s $@ - || echo $(VCSVERSION) > $@
 
 clean:
 	-$(RM) *.o
-	-$(RM) _hgversion
+	-$(RM) _version
 	-$(RM) mdns-repeater
 	-$(RM) mdns-repeater-*.zip
 
diff --git a/mdns-repeater.c b/mdns-repeater.c
index 03417d0..748ccf6 100644
--- a/mdns-repeater.c
+++ b/mdns-repeater.c
@@ -288,7 +288,7 @@ static void daemonize() {
 }
 
 static void show_help(const char *progname) {
-	fprintf(stderr, "mDNS repeater (version " HGVERSION ")\n");
+	fprintf(stderr, "mDNS repeater (version " VCSVERSION ")\n");
 	fprintf(stderr, "Copyright (C) 2011 Darell Tan\n\n");
 
 	fprintf(stderr, "usage: %s [ -f ] <ifdev> ...\n", progname);
-- 
cgit v1.2.3