Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update/fix rpm and deb packaging
[src/xds/xds-server.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
86107f1
..
3877ab7
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,5
@@
###########################################################################
###########################################################################
-# Copyright 2017 IoT.bzh
+# Copyright 2017
-2018
IoT.bzh
#
# author: Sebastien Douheret <sebastien@iot.bzh>
#
#
# author: Sebastien Douheret <sebastien@iot.bzh>
#
@@
-57,7
+57,7
@@
endif
HOST_GOOS=$(shell go env GOOS)
HOST_GOARCH=$(shell go env GOARCH)
ARCH=$(HOST_GOOS)-$(HOST_GOARCH)
HOST_GOOS=$(shell go env GOOS)
HOST_GOARCH=$(shell go env GOARCH)
ARCH=$(HOST_GOOS)-$(HOST_GOARCH)
-REPOPATH=g
ithub.com/iotbzh
/xds-server
+REPOPATH=g
errit.automotivelinux.org/gerrit/src/xds
/xds-server
EXT=
ifeq ($(HOST_GOOS), windows)
EXT=
ifeq ($(HOST_GOOS), windows)
@@
-66,7
+66,7
@@
endif
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path)))
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path)))
-ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..)
+ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..
/../..
)
LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
PACKAGE_DIR := $(ROOT_SRCDIR)/package
LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
PACKAGE_DIR := $(ROOT_SRCDIR)/package
@@
-103,7
+103,10
@@
endif
ifeq ($(SUB_VERSION), )
PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
else
ifeq ($(SUB_VERSION), )
PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
else
- PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION)_$(SUB_VERSION).zip
+ # only use dot as separator to allow rpm packaging (see version .spec file)
+ PK_VER := $(subst _,.,$(subst -,,$(VERSION)))
+ PK_SBVER := $(subst _,.,$(subst -,,$(SUB_VERSION)))
+ PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(PK_VER).$(PK_SBVER).zip
endif
endif
@@
-149,7
+152,7
@@
webapp/install:
.PHONY: scripts
scripts:
.PHONY: scripts
scripts:
- @mkdir -p $(LOCAL_BINDIR) && cp -rf scripts/xds-utils $(LOCAL_BINDIR)
+ @mkdir -p $(LOCAL_BINDIR) && cp -rf scripts/xds-utils
scripts/sdks
$(LOCAL_BINDIR)
.PHONY: conffile
conffile:
.PHONY: conffile
conffile:
@@
-189,8
+192,8
@@
vendor: tools/glide glide.yaml
$(LOCAL_TOOLSDIR)/glide install --strip-vendor
vendor/debug: vendor
$(LOCAL_TOOLSDIR)/glide install --strip-vendor
vendor/debug: vendor
- (cd vendor/g
ithub.com/iotbzh
&& \
- rm -rf xds-common
&& ln -s ../../../../xds-common
)
+ (cd vendor/g
errit.automotivelinux.org/gerrit/src/xds
&& \
+ rm -rf xds-common
.git && ln -s ../../../../../../xds-common xds-common.git
)
.PHONY: tools/glide
tools/glide:
.PHONY: tools/glide
tools/glide: