Code Review
/
src
/
xds
/
xds-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
ef33f26
)
Set SUB_VERSION as current commit ID.
author
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Fri, 23 Jun 2017 17:10:44 +0000
(19:10 +0200)
committer
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Fri, 23 Jun 2017 17:10:44 +0000
(19:10 +0200)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
916b133
..
d088c5d
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-15,7
+15,7
@@
ifeq ($(origin SUB_VERSION), undefined)
VERSION := $(firstword $(subst -, ,$(SUB_VERSION)))
SUB_VERSION := $(word 2,$(subst -, ,$(SUB_VERSION)))
else
VERSION := $(firstword $(subst -, ,$(SUB_VERSION)))
SUB_VERSION := $(word 2,$(subst -, ,$(SUB_VERSION)))
else
- SUB_VERSION := $(shell git
describe --tags --always | sed 's/^v//'
)
+ SUB_VERSION := $(shell git
rev-parse --short HEAD
)
ifeq ($(SUB_VERSION), )
SUB_VERSION := unknown-dev
endif
ifeq ($(SUB_VERSION), )
SUB_VERSION := unknown-dev
endif
@@
-55,7
+55,6
@@
LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
PACKAGE_DIR := $(ROOT_SRCDIR)/package
LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
PACKAGE_DIR := $(ROOT_SRCDIR)/package
-
export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
export PATH := $(PATH):$(LOCAL_TOOLSDIR)
export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
export PATH := $(PATH):$(LOCAL_TOOLSDIR)