From: John Melton - G0ORX/N6LYT <john.d.melton@googlemail.com>
Date: Sat, 26 Nov 2016 10:59:43 +0000 (+0000)
Subject: Updated version display. Added user manual.
X-Git-Url: https://git.rkrishnan.org/uri//%22%22?a=commitdiff_plain;h=c1ef24cb9cd03eb61c9a8d65a4b6eff8e1b3e9a3;p=pihpsdr.git

Updated version display. Added user manual.
---

diff --git a/Makefile b/Makefile
index 896a946..70c7c5f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # Get git commit version and date
-GIT_VERSION := $(shell git --no-pager describe --tags --always --dirty)
+#GIT_VERSION := $(shell git --no-pager describe --tags --always --dirty)
 GIT_DATE := $(firstword $(shell git --no-pager show --date=short --format="%ai" --name-only))
+GIT_VERSION := $(shell git describe --abbrev=0 --tags)
 
 # uncomment the line below to include support for psk31
 PSK_INCLUDE=PSK
@@ -253,5 +254,6 @@ clean:
 install:
 	cp pihpsdr ../pihpsdr
 	cp pihpsdr ./release/pihpsdr
+	cd release; tar cvf pihpsdr_$(GIT_VERSION).tar pihpsdr
 	cd release; tar cvf pihpsdr.tar pihpsdr
 
diff --git a/main.c b/main.c
index fbcb638..0909509 100644
--- a/main.c
+++ b/main.c
@@ -886,7 +886,7 @@ gint init(void* arg) {
 int main (int   argc, char *argv[]) {
   gtk_init (&argc, &argv);
 
-  fprintf(stderr,"Build: %s %s\n",build_date,build_version);
+  fprintf(stderr,"Build: %s %s\n",build_date,version);
 
   uname(&unameData);
   fprintf(stderr,"sysname: %s\n",unameData.sysname);
diff --git a/meter.c b/meter.c
index 0cb961a..7da8277 100644
--- a/meter.c
+++ b/meter.c
@@ -215,7 +215,7 @@ void meter_update(int meter_type,double value,double reverse,double exciter,doub
   cairo_set_source_rgb (cr, 0, 0, 0);
   cairo_paint (cr);
 
-  //sprintf(text,"Version: %s %s", build_date, build_version);
+  //sprintf(text,"Version: %s %s", build_date, version);
   sprintf(text,"Version: %s", version);
   cairo_select_font_face(cr, "FreeMono",
                 CAIRO_FONT_SLANT_NORMAL,
diff --git a/pihpsdr b/pihpsdr
index c318b99..9936bdd 100755
Binary files a/pihpsdr and b/pihpsdr differ
diff --git a/release/documentation/piHPSDR-Controller-Users-Guide-v21.odt b/release/documentation/piHPSDR-Controller-Users-Guide-v21.odt
new file mode 100644
index 0000000..81a1031
Binary files /dev/null and b/release/documentation/piHPSDR-Controller-Users-Guide-v21.odt differ
diff --git a/release/documentation/piHPSDR-Controller-Users-Guide-v21.pdf b/release/documentation/piHPSDR-Controller-Users-Guide-v21.pdf
new file mode 100644
index 0000000..d17bbfa
Binary files /dev/null and b/release/documentation/piHPSDR-Controller-Users-Guide-v21.pdf differ
diff --git a/release/pihpsdr.tar b/release/pihpsdr.tar
index fb325c9..7461c19 100644
Binary files a/release/pihpsdr.tar and b/release/pihpsdr.tar differ
diff --git a/release/pihpsdr/pihpsdr b/release/pihpsdr/pihpsdr
index c318b99..9936bdd 100755
Binary files a/release/pihpsdr/pihpsdr and b/release/pihpsdr/pihpsdr differ
diff --git a/splash.c b/splash.c
index c021c99..9dded3e 100644
--- a/splash.c
+++ b/splash.c
@@ -69,7 +69,7 @@ void splash_show(char* image_name,int width,int height,int full_screen)
             G_CALLBACK (splash_configure_event_cb), NULL);
 
   char build[64];
-  sprintf(build,"build: %s %s",build_date, build_version);
+  sprintf(build,"build: %s %s",build_date, version);
 
   GtkWidget *pi_label=gtk_label_new("pihpsdr by John Melton g0orx/n6lyt");
   gtk_label_set_justify(GTK_LABEL(pi_label),GTK_JUSTIFY_LEFT);
diff --git a/version.c b/version.c
index c9ca9a9..ea57553 100644
--- a/version.c
+++ b/version.c
@@ -20,4 +20,4 @@
 char build_date[]=GIT_DATE;
 char build_version[]=GIT_VERSION;
 
-char version[]="1.0.2";
+char version[]=GIT_VERSION;