X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=29a33a824ee3f58cd14f5af69510c3c9232594c4;hb=d21eb59c4f7fe9844646bd60ac34aa1d3cbb792f;hp=597785473ab1c50bf1a2deb85b44392cfa420337;hpb=ec7051e1da665206f594c7616ad381bfeaea333a;p=src%2Fxds%2Fxds-server.git

diff --git a/Makefile b/Makefile
index 5977854..29a33a8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,70 +1,115 @@
 # Makefile used to build XDS daemon Web Server
 
+# Application Version
+VERSION := 0.1.0
+
+# Syncthing version to install
+SYNCTHING_VERSION = 0.14.28
+SYNCTHING_INOTIFY_VERSION = 0.8.6
+
+
 # Retrieve git tag/commit to set sub-version string
-ifeq ($(origin VERSION), undefined)
-	VERSION := $(shell git describe --tags --always | sed 's/^v//')
-	ifeq ($(VERSION), )
-		VERSION=unknown-dev
+ifeq ($(origin SUB_VERSION), undefined)
+	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)))
+	else
+		SUB_VERSION := $(shell git describe --tags --always  | sed 's/^v//')
+		ifeq ($(SUB_VERSION), )
+			SUB_VERSION := unknown-dev
+		endif
 	endif
 endif
 
+# 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 /usr/local/...)
+ifeq ($(origin DESTDIR), undefined)
+	DESTDIR := /usr/local/bin
+endif
+ifeq ($(origin DESTDIR_WWW), undefined)
+	DESTDIR_WWW := $(DESTDIR)/www-xds-server
+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/${HOST_GOOS}
+PACKAGE_DIR := $(ROOT_SRCDIR)/package
+
 
 export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
-export PATH := $(PATH):$(ROOT_SRCDIR)/tools
+export PATH := $(PATH):$(LOCAL_TOOLSDIR)
 
 VERBOSE_1 := -v
 VERBOSE_2 := -v -x
 
-#WHAT := xds-make
+# Release or Debug mode
+ifeq ($(filter 1,$(RELEASE) $(REL)),)
+	GORELEASE=
+	BUILD_MODE="Debug mode"
+else
+	# optimized code without debug info
+	GORELEASE= -s -w
+	BUILD_MODE="Release mode"
+endif
 
-all: build webapp
+ifeq ($(SUB_VERSION), )
+	PACKAGE_ZIPFILE := xds-server_$(ARCH)-v$(VERSION).zip
+else
+	PACKAGE_ZIPFILE := xds-server_$(ARCH)-v$(VERSION)_$(SUB_VERSION).zip
+endif
 
-#build: build/xds build/cmds
-build: build/xds
 
-xds: build/xds
+all: tools/syncthing build
 
-build/xds: vendor
-	@echo "### Build XDS server (version $(VERSION))";
-	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o bin/xds-server -ldflags "-X main.AppVersionGitTag=$(VERSION)" .
+.PHONY: build
+build: xds webapp
 
-#build/cmds: vendor
-#	@for target in $(WHAT); do \
-#		echo "### Build $$target"; \
-#		$(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o bin/$$target -ldflags "-X main.AppVersionGitTag=$(VERSION)" ./cmd/$$target; \
-#	done
+xds:vendor scripts tools/syncthing/copytobin
+	@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$(EXT) -ldflags "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .
 
 test: tools/glide
-	go test --race $(shell ./tools/glide novendor)
+	go test --race $(shell $(LOCAL_TOOLSDIR)/glide novendor)
 
 vet: tools/glide
-	go vet $(shell ./tools/glide novendor)
+	go vet $(shell $(LOCAL_TOOLSDIR)/glide novendor)
 
 fmt: tools/glide
-	go fmt $(shell ./tools/glide novendor)
+	go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor)
 
-run: build/xds
-	./bin/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
-	./bin/xds-server --log debug -c config.json.in
+debug: build/xds webapp/debug tools/syncthing/copytobin
+	$(LOCAL_BINDIR)/xds-server$(EXT) --log debug -c config.json.in
 
+.PHONY: clean
 clean:
-	rm -rf ./bin/* debug cmd/*/debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH)
+	rm -rf $(LOCAL_BINDIR)/* debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) $(PACKAGE_DIR)
 
+.PHONY: distclean
 distclean: clean
-	rm -rf bin tools glide.lock vendor cmd/*/vendor webapp/{node_modules,dist}
-
-run3:
-	goreman start
+	rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor webapp/node_modules webapp/dist
 
 webapp: webapp/install
 	(cd webapp && gulp build)
@@ -74,45 +119,76 @@ webapp/debug:
 
 webapp/install:
 	(cd webapp && npm install)
-
-
-# FIXME - package webapp
-release: releasetar
-	goxc -d ./release -tasks-=go-vet,go-test -os="linux darwin" -pv=$(VERSION)  -arch="386 amd64 arm arm64" -build-ldflags="-X main.AppVersionGitTag=$(VERSION)" -resources-include="README.md,Documentation,LICENSE,contrib" -main-dirs-exclude="vendor"
-
-releasetar:
-	mkdir -p release/$(VERSION)
-	glide install --strip-vcs --strip-vendor --update-vendored --delete
-	glide-vc --only-code --no-tests --keep="**/*.json.in"
-	git ls-files > /tmp/xds-server-build
-	find vendor >> /tmp/xds-server-build
-	find webapp/ -path webapp/node_modules -prune -o -print >> /tmp/xds-server-build
-	tar -cvf release/$(VERSION)/xds-server_$(VERSION)_src.tar -T /tmp/xds-server-build --transform 's,^,xds-server_$(VERSION)/,'
-	rm /tmp/xds-server-build
-	gzip release/$(VERSION)/xds-server_$(VERSION)_src.tar
-
+	@if [ -d ${DESTDIR}/usr/local/etc ]; then rm -rf ${DESTDIR}/usr; fi
+
+.PHONY: scripts
+scripts:
+	@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
+
+.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; }
+	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-xds-server
+	(cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-server)
+
+.PHONY: package-all
+package-all:
+	@echo "# Build linux amd64..."
+	GOOS=linux GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
+	@echo "# Build windows amd64..."
+	GOOS=windows GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
 
 vendor: tools/glide glide.yaml
-	./tools/glide install --strip-vendor
+	$(LOCAL_TOOLSDIR)/glide install --strip-vendor
 
+.PHONY: tools/glide
 tools/glide:
-	@echo "Downloading glide"
-	mkdir -p tools
-	curl --silent -L https://glide.sh/get | GOBIN=./tools  sh
-
-goenv:
-	@go env
-
+	@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 -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/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; }
+	@cp -f $(LOCAL_TOOLSDIR)/syncthing$(EXT) $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT) $(LOCAL_BINDIR)
+
+.PHONY: help
 help:
 	@echo "Main supported rules:"
-	@echo "  build               (default)"
-	@echo "  build/xds"
-	@echo "  build/cmds"
-	@echo "  release"
+	@echo "  all                (default)"
+	@echo "  build"
+	@echo "  install"
 	@echo "  clean"
 	@echo "  distclean"
 	@echo ""
 	@echo "Influential make variables:"
 	@echo "  V                 - Build verbosity {0,1,2}."
 	@echo "  BUILD_ENV_FLAGS   - Environment added to 'go build'."
-#	@echo "  WHAT              - Command to build. (e.g. WHAT=xds-make)"