shpp: Set version from git_revgen, remove separate revision

Thaodan · Aug 2, 2020 · a80db86 · a80db86
1 parent 03983d0
commit a80db86
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -1,9 +1,7 @@
 include ../rules.mk
 # app specific  stuff
 TARGET		= shpp
-SHPP_VER	= 1.9.1.1
-GIT_REV		= $(shell ../tools/git_revgen)
-
+SHPP_VER	=  $(shell ../tools/git_revgen)
 all: $(TARGET)
 
 $(TARGET): ${TARGET:=.in.sh}

diff --git a/src/shpp.in.sh b/src/shpp.in.sh
@@ -20,9 +20,7 @@
 
 # config vars ### 
 ####################################
-# version, rev config
 SHPP_VER=@VER@
-SHPP_REV=@GITREV@
 #####################################
 # base config 
 
@@ -962,8 +960,8 @@ if [ ! $# = 0 ] ; then
     while [ ! $# = 0 ] ; do
 	case $1 in 
 	    --help|-H|-h)	print_help ; shift ;; 
-	    --revision) 	echo $SHPP_REV ; shift ;;
-	    -V|--version)	echo $SHPP_VER:$SHPP_REV  ; shift ;;
+	    --revision) 	echo $SHPP_VER ; shift ;;
+	    -V|--version)	echo $SHPP_VER  ; shift ;;
 	    --*|*)
 		optspec=o:O:Cc:D:I:M:v # b:dp #-: # short options
 		optspec_long=output:,option:,config:,color,,legacy,stdout,critical-warning,tmp:,stderr:,keep,debug::,verbose,errexit,\*=\* #,binpath:,desktop,prefix # long options