X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=d54696164177e8840a4c24ca7bf6ca9061033a52;hb=1b9336d459474c76dc806757e7ddf49edfd65a33;hp=b077bc712bcb2b1c317b7be55d9f123fb1c7a587;hpb=63f550ad8dc0061b1e010138d7fbbb55318550d4;p=src%2Fxds%2Fxds-server.git diff --git a/Makefile b/Makefile index b077bc7..d546961 100644 --- a/Makefile +++ b/Makefile @@ -1,40 +1,60 @@ # Makefile used to build XDS daemon Web Server # Application Version -VERSION := 0.0.1 +VERSION := 0.3.2 # Syncthing version to install -SYNCTHING_VERSION = 0.14.27 -# FIXME: use patched version while waiting integration of #165 -#SYNCTHING_INOTIFY_VERSION = 0.8.5 +SYNCTHING_VERSION = 0.14.38 +SYNCTHING_INOTIFY_VERSION = 0.8.7 # Retrieve git tag/commit to set sub-version string ifeq ($(origin SUB_VERSION), undefined) - SUB_VERSION := $(shell git describe --tags --always | sed 's/^v//') + SUB_VERSION := $(shell git describe --exact-match --tags 2>/dev/null | sed 's/^v//') + ifneq ($(SUB_VERSION), ) + VERSION := $(firstword $(subst -, ,$(SUB_VERSION))) + SUB_VERSION := $(word 2,$(subst -, ,$(SUB_VERSION))) + endif ifeq ($(SUB_VERSION), ) - SUB_VERSION=unknown-dev + SUB_VERSION := $(shell git rev-parse --short HEAD) + ifeq ($(SUB_VERSION), ) + SUB_VERSION := unknown-dev + endif endif endif -# Configurable variables for installation (default /usr/local/...) -ifeq ($(origin INSTALL_DIR), undefined) - INSTALL_DIR := /usr/local/bin +# for backward compatibility +ifneq ($(origin INSTALL_DIR), undefined) + DESTDIR := $(INSTALL_DIR) +endif +ifneq ($(origin INSTALL_WEBAPP_DIR), undefined) + DESTDIR_WWW := $(INSTALL_WEBAPP_DIR) +endif + +# Configurable variables for installation (default /opt/AGL/...) +ifeq ($(origin DESTDIR), undefined) + DESTDIR := /opt/AGL/xds/server endif -ifeq ($(origin INSTALL_WEBAPP_DIR), undefined) - INSTALL_WEBAPP_DIR := $(INSTALL_DIR)/xds-server-www +ifeq ($(origin DESTDIR_WWW), undefined) + DESTDIR_WWW := $(DESTDIR)/www endif HOST_GOOS=$(shell go env GOOS) HOST_GOARCH=$(shell go env GOARCH) +ARCH=$(HOST_GOOS)-$(HOST_GOARCH) REPOPATH=github.com/iotbzh/xds-server +EXT= +ifeq ($(HOST_GOOS), windows) + EXT=.exe +endif + mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path))) ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..) LOCAL_BINDIR := $(ROOT_SRCDIR)/bin -LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools - +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) @@ -42,15 +62,34 @@ export PATH := $(PATH):$(LOCAL_TOOLSDIR) VERBOSE_1 := -v VERBOSE_2 := -v -x +# Release or Debug mode +ifeq ($(filter 1,$(RELEASE) $(REL)),) + GO_LDFLAGS= + # disable compiler optimizations and inlining + GO_GCFLAGS=-N -l + BUILD_MODE="Debug mode" +else + # optimized code without debug info + GO_LDFLAGS=-s -w + GO_GCFLAGS= + BUILD_MODE="Release mode" +endif + +ifeq ($(SUB_VERSION), ) + PACKAGE_ZIPFILE := xds-server_$(ARCH)-v$(VERSION).zip +else + PACKAGE_ZIPFILE := xds-server_$(ARCH)-v$(VERSION)_$(SUB_VERSION).zip +endif -all: build webapp + +all: tools/syncthing build .PHONY: build -build: xds +build: vendor xds webapp -xds:vendor scripts - @echo "### Build XDS server (version $(VERSION), subversion $(SUB_VERSION))"; - @cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-server -ldflags "-X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" . +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)" . test: tools/glide go test --race $(shell $(LOCAL_TOOLSDIR)/glide novendor) @@ -61,62 +100,103 @@ vet: tools/glide fmt: tools/glide go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor) -run: build/xds tools/syncthing - $(LOCAL_BINDIR)/xds-server --log info -c config.json.in +run: build/xds tools/syncthing/copytobin + $(LOCAL_BINDIR)/xds-server$(EXT) --log info -c config.json.in -debug: build/xds webapp/debug tools/syncthing - $(LOCAL_BINDIR)/xds-server --log debug -c config.json.in +debug: build/xds tools/syncthing/copytobin + $(LOCAL_BINDIR)/xds-server$(EXT) --log debug -c config.json.in .PHONY: clean clean: - rm -rf $(LOCAL_BINDIR)/* debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) + rm -rf $(LOCAL_BINDIR)/* debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) $(PACKAGE_DIR) .PHONY: distclean distclean: clean - rm -rf $(LOCAL_BINDIR) $(LOCAL_TOOLSDIR) glide.lock vendor webapp/node_modules webapp/dist + rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor $(ROOT_SRCDIR)/webapp/dist $(ROOT_SRCDIR)/webapp/node_modules webapp: webapp/install - (cd webapp && gulp build) - -webapp/debug: - (cd webapp && gulp watch &) + mkdir -p $(ROOT_SRCDIR)/webapp/dist $(ROOT_SRCDIR)/webapp/dist/fonts + (cd $(ROOT_SRCDIR)/webapp && cp -a ./assets ./src/index.html ./node_modules/font-awesome/css/font-awesome.min.css ./dist/) + (cd $(ROOT_SRCDIR)/webapp && cp -a ./node_modules/font-awesome/fonts/* ./dist/fonts/) webapp/install: (cd webapp && npm install) .PHONY: scripts scripts: - @mkdir -p $(LOCAL_BINDIR) && cp -rf scripts/xds-start-server.sh scripts/agl $(LOCAL_BINDIR) + @mkdir -p $(LOCAL_BINDIR) && cp -rf scripts/xds-server-st*.sh scripts/xds-utils $(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 .PHONY: install -install: all scripts tools/syncthing - mkdir -p $(INSTALL_DIR) \ - && cp $(LOCAL_BINDIR)/* $(INSTALL_DIR) \ - && cp $(LOCAL_TOOLSDIR)/syncthing* $(INSTALL_DIR) - mkdir -p $(INSTALL_WEBAPP_DIR) \ - && cp -a webapp/dist/* $(INSTALL_WEBAPP_DIR) +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; } + mkdir -p $(DESTDIR) \ + && cp -a $(LOCAL_BINDIR)/* $(DESTDIR) + mkdir -p $(DESTDIR_WWW) \ + && cp -a webapp/dist/* $(DESTDIR_WWW) + +.PHONY: _package +_package: clean + make -f $(ROOT_SRCDIR)/Makefile all install DESTDIR=$(PACKAGE_DIR)/xds-server + make -f $(ROOT_SRCDIR)/Makefile conffile DESTDIR=$(PACKAGE_DIR)/xds-server DESTDIR_WWW=www + cp -r $(ROOT_SRCDIR)/conf.d $(PACKAGE_DIR)/xds-server + rm -f $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) + (cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-server) + +# On support Linux for now +.PHONY: package +package: + @echo "# Build linux amd64..." + GOOS=linux GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile _package + make -f $(ROOT_SRCDIR)/Makefile clean + +.PHONY: package-all +package-all: package 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 ) + +.PHONY: tools/glide tools/glide: - @echo "Downloading glide" - mkdir -p $(LOCAL_TOOLSDIR) - curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR) sh + @test -f $(LOCAL_TOOLSDIR)/glide || { \ + echo "Downloading glide"; \ + mkdir -p $(LOCAL_TOOLSDIR); \ + curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR) sh; \ + } .PHONY: tools/syncthing tools/syncthing: - @(test -s $(LOCAL_TOOLSDIR)/syncthing || \ + @test -e $(LOCAL_TOOLSDIR)/syncthing$(EXT) -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT) || { \ + mkdir -p $(LOCAL_TOOLSDIR); \ DESTDIR=$(LOCAL_TOOLSDIR) \ SYNCTHING_VERSION=$(SYNCTHING_VERSION) \ SYNCTHING_INOTIFY_VERSION=$(SYNCTHING_INOTIFY_VERSION) \ - ./scripts/get-syncthing.sh) + ./scripts/xds-utils/get-syncthing.sh; } + +.PHONY: +tools/syncthing/copytobin: + @test -e $(LOCAL_TOOLSDIR)/syncthing$(EXT) -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make tools/syncthing\n"; exit 1; } + @mkdir -p $(LOCAL_BINDIR) + @cp -f $(LOCAL_TOOLSDIR)/syncthing$(EXT) $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT) $(LOCAL_BINDIR) .PHONY: help help: @echo "Main supported rules:" @echo " all (default)" @echo " build" + @echo " package" @echo " install" @echo " clean" @echo " distclean"