X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=f7f7a9a9789b844d7fe86cea4dbe9e1aa37909db;hb=9cc4aa5bcfa8fbab2d367fde9bc5ba4ff204c5e7;hp=adb123563fb6f8b5f40e431b70b62ef84dbf1af7;hpb=898a31f393577f7f5682434bd607a68010fd888f;p=src%2Fxds%2Fxds-server.git

diff --git a/Makefile b/Makefile
index adb1235..f7f7a9a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,24 @@
-# Makefile used to build XDS Server
+ ###########################################################################
+# Copyright 2017-2018 IoT.bzh
+#
+# author: Sebastien Douheret <sebastien@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+# Application Name
+TARGET=xds-server
+
 
 # Syncthing version to install
 SYNCTHING_VERSION = 0.14.38
@@ -9,7 +29,7 @@ SYNCTHING_INOTIFY_VERSION = 0.8.7
 GIT_DESC := $(shell git describe --always --tags)
 VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
 ifeq (-,$(findstring -,$(GIT_DESC)))
-SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
+	SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
 endif
 ifeq ($(VERSION), )
 	VERSION := unknown-dev
@@ -37,7 +57,7 @@ endif
 HOST_GOOS=$(shell go env GOOS)
 HOST_GOARCH=$(shell go env GOARCH)
 ARCH=$(HOST_GOOS)-$(HOST_GOARCH)
-REPOPATH=github.com/iotbzh/xds-server
+REPOPATH=gerrit.automotivelinux.org/gerrit/src/xds/$(TARGET)
 
 EXT=
 ifeq ($(HOST_GOOS), windows)
@@ -46,7 +66,7 @@ endif
 
 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
@@ -83,7 +103,10 @@ endif
 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
 
 
@@ -97,7 +120,11 @@ xds: scripts tools/syncthing/copytobin
 	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/$(TARGET)$(EXT) -ldflags "$(GO_LDFLAGS) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" .
 
 test: tools/glide
-	go test --race $(shell $(LOCAL_TOOLSDIR)/glide novendor)
+ifndef name
+	go test --race ./test -v
+else
+	go test --race ./test -v -run $(name)
+endif
 
 vet: tools/glide
 	go vet $(shell $(LOCAL_TOOLSDIR)/glide novendor)
@@ -106,18 +133,18 @@ fmt: tools/glide
 	go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor)
 
 run: build/xds tools/syncthing/copytobin
-	$(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info -c config.json.in
+	$(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info $(XDS_SERVER_RUN_ARGS)
 
 debug: build/xds tools/syncthing/copytobin
-	$(LOCAL_BINDIR)/$(TARGET)$(EXT) --log debug -c config.json.in
+	$(LOCAL_BINDIR)/$(TARGET)$(EXT) --log debug $(XDS_SERVER_DEBUG_ARGS)
 
 .PHONY: clean
 clean:
-	rm -rf $(LOCAL_BINDIR)/* debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) $(PACKAGE_DIR)
+	rm -rf $(LOCAL_BINDIR)/* $(ROOT_SRCDIR)/debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) $(PACKAGE_DIR)
 
 .PHONY: distclean
 distclean: clean
-	rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor $(ROOT_SRCDIR)/webapp/dist $(ROOT_SRCDIR)/webapp/node_modules
+	(cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/dist ./webapp/node_modules)
 
 webapp: webapp/install
 	mkdir -p $(ROOT_SRCDIR)/webapp/dist $(ROOT_SRCDIR)/webapp/dist/fonts
@@ -126,23 +153,23 @@ webapp: webapp/install
 
 webapp/install:
 	(cd webapp && npm install)
+	@[ -d ${DESTDIR}/usr ] && { echo "Removing unwanted ${DESTDIR}/usr directory"; rm -rf ${DESTDIR}/usr; } || true
 
 .PHONY: scripts
 scripts:
-	@mkdir -p $(LOCAL_BINDIR) && cp -rf scripts/xds-server-st*.sh scripts/xds-utils $(LOCAL_BINDIR)
+	@mkdir -p $(LOCAL_BINDIR) && cp -rf scripts/xds-utils scripts/sdks $(LOCAL_BINDIR)
 
 .PHONY: conffile
 conffile:
-	cat config.json.in \
-		| sed -e s,"webapp/dist","$(DESTDIR_WWW)",g \
-		| sed -e s,"\./bin","",g \
-		 > $(DESTDIR)/config.json.in
+	cat $(ROOT_SRCDIR)/conf.d/etc/xds/server/server-config.json \
+		| sed -e s,"www","$(DESTDIR_WWW)",g \
+		 > $(DESTDIR)/server-config.json.in
 
 .PHONY: install
 install:
-	@test -e $(LOCAL_BINDIR)/xds-server$(EXT) -a -d webapp/dist || { echo "Please execute first: make all\n"; exit 1; }
-	@test -e $(LOCAL_BINDIR)/xds-server-start.sh -a -d $(LOCAL_BINDIR)/xds-utils || { echo "Please execute first: make all\n"; exit 1; }
-	@test -e $(LOCAL_BINDIR)/syncthing$(EXT) -a -e $(LOCAL_BINDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make all\n"; exit 1; }
+	@test -e $(LOCAL_BINDIR)/xds-server$(EXT) -a -d webapp/dist || { echo "Please execute first: make all"; exit 1; }
+	@test -d $(LOCAL_BINDIR)/xds-utils || { echo "Please execute first: make all"; exit 1; }
+	@test -e $(LOCAL_BINDIR)/syncthing$(EXT) -a -e $(LOCAL_BINDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make all"; exit 1; }
 	mkdir -p $(DESTDIR) \
 		&& cp -a $(LOCAL_BINDIR)/* $(DESTDIR)
 	mkdir -p $(DESTDIR_WWW) \
@@ -170,15 +197,15 @@ vendor: tools/glide glide.yaml
 	$(LOCAL_TOOLSDIR)/glide install --strip-vendor
 
 vendor/debug: vendor
-	(cd vendor/github.com/iotbzh && \
-		rm -rf xds-common && ln -s ../../../../xds-common )
+	(cd vendor/gerrit.automotivelinux.org/gerrit/src/xds && \
+		rm -rf xds-common.git && ln -s ../../../../../../xds-common xds-common.git  )
 
 .PHONY: tools/glide
 tools/glide:
 	@test -f $(LOCAL_TOOLSDIR)/glide || { \
 		echo "Downloading glide"; \
 		mkdir -p $(LOCAL_TOOLSDIR); \
-		curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh; \
+		curl --silent --connect-timeout 60 --retry 3 -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh; \
 	}
 
 .PHONY: tools/syncthing