X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=271061c6af04b15e79bc757ddc887a022ffa71f9;hb=65e09e831cf13343ac713fbf15281174d1f13a94;hp=cf2de0f2cb6f776e3a4bc934a2cb1b7740cb9e5b;hpb=c2f1a886384e70a7e97ca15df923dd561b1968df;p=src%2Fxds%2Fxds-server.git

diff --git a/Makefile b/Makefile
index cf2de0f..271061c 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
@@ -8,7 +28,9 @@ SYNCTHING_INOTIFY_VERSION = 0.8.7
 # Retrieve git tag/commit to set version & sub-version strings
 GIT_DESC := $(shell git describe --always --tags)
 VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
-SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
+ifeq (-,$(findstring -,$(GIT_DESC)))
+	SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
+endif
 ifeq ($(VERSION), )
 	VERSION := unknown-dev
 endif
@@ -35,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/xds-server
 
 EXT=
 ifeq ($(HOST_GOOS), windows)
@@ -44,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
@@ -69,17 +91,19 @@ ifeq ($(filter 1,$(RELEASE) $(REL)),)
 	# disable compiler optimizations and inlining
 	GO_GCFLAGS=-N -l
 	BUILD_MODE="Debug mode"
+	WEBAPP_BUILD_RULE=build
 else
 	# optimized code without debug info
 	GO_LDFLAGS=-s -w
 	GO_GCFLAGS=
 	BUILD_MODE="Release mode"
+	WEBAPP_BUILD_RULE=build:prod
 endif
 
 ifeq ($(SUB_VERSION), )
-	PACKAGE_ZIPFILE := xds-server_$(ARCH)-v$(VERSION).zip
+	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
 else
-	PACKAGE_ZIPFILE := xds-server_$(ARCH)-v$(VERSION)_$(SUB_VERSION).zip
+	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION)_$(SUB_VERSION).zip
 endif
 
 
@@ -89,8 +113,8 @@ all: tools/syncthing build
 build: checkgover vendor xds webapp
 
 xds: scripts tools/syncthing/copytobin
-	@echo "### Build XDS server (version $(VERSION), subversion $(SUB_VERSION), $(BUILD_MODE))";
-	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-server$(EXT) -ldflags "$(GO_LDFLAGS) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" .
+	@echo "### Build XDS server (version $(VERSION), subversion $(SUB_VERSION)) - $(BUILD_MODE)";
+	@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)
@@ -102,10 +126,10 @@ fmt: tools/glide
 	go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor)
 
 run: build/xds tools/syncthing/copytobin
-	$(LOCAL_BINDIR)/xds-server$(EXT) --log info -c config.json.in
+	$(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info $(XDS_SERVER_RUN_ARS)
 
 debug: build/xds tools/syncthing/copytobin
-	$(LOCAL_BINDIR)/xds-server$(EXT) --log debug -c config.json.in
+	$(LOCAL_BINDIR)/$(TARGET)$(EXT) --log debug $(XDS_SERVER_DEBUG_ARGS)
 
 .PHONY: clean
 clean:
@@ -125,19 +149,18 @@ webapp/install:
 
 .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 -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; }
 	mkdir -p $(DESTDIR) \
 		&& cp -a $(LOCAL_BINDIR)/* $(DESTDIR)
@@ -166,8 +189,8 @@ 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: