Skip to content

Commit

Permalink
Must check tag against MAVEN_VERSION, as that will contain the possibly
Browse files Browse the repository at this point in the history
nonnumeric part.
  • Loading branch information
uckelman committed Aug 13, 2020
1 parent 3352310 commit bbdf52a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ DISTDIR:=dist
JDKDIR:=$(DISTDIR)/jdks
JDOCDIR:=jdoc

# numeric part of the version only
VNUM:=3.3.3

#MAVEN_VERSION:=$(VNUM)-SNAPSHOT
MAVEN_VERSION:=$(VNUM)-beta1

Expand All @@ -52,7 +54,7 @@ JARNAME:=vassal-app-$(MAVEN_VERSION)
GITBRANCH:=$(shell git rev-parse --abbrev-ref HEAD)
GITCOMMIT:=$(shell git rev-parse --short HEAD)

ifeq ($(shell git describe --tags), $(VNUM))
ifeq ($(shell git describe --tags), $(MAVEN_VERSION))
# we are at a release tag
VERSION:=$(MAVEN_VERSION)
else ifeq ($(GITBRANCH), master)
Expand Down

0 comments on commit bbdf52a

Please sign in to comment.