X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=51e17952643ba7310e1e49a1eb337a79c5db4391;hb=a58e296c780f3f9f3a8f71a27cef0d202b13674b;hp=3329ead223dab4f40ff6303c0bf3b8935471a135;hpb=d917dcca04b8d5f5a7a4fdf82d0a66ef14611fca;p=src%2Fxds%2Fxds-agent.git

diff --git a/Makefile b/Makefile
index 3329ead..51e1795 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,16 @@
-# Makefile used to build XDS daemon Web Server
-
-# Application Version
-VERSION := 0.2.0
+# Makefile used to build XDS Agent
 
 # Syncthing version to install
 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 --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 := $(shell git rev-parse --short HEAD)
-		ifeq ($(SUB_VERSION), )
-			SUB_VERSION := unknown-dev
-		endif
-	endif
+# 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 ($(VERSION), )
+	VERSION := unknown-dev
 endif
 
 # Configurable variables for installation (default /opt/AGL/...)
@@ -81,7 +71,7 @@ build: vendor xds webapp
 
 xds: scripts tools/syncthing/copytobin
 	@echo "### Build XDS agent (version $(VERSION), subversion $(SUB_VERSION)) - $(BUILD_MODE)";
-	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-agent$(EXT) -ldflags "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" .
+	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-agent$(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)
@@ -117,14 +107,19 @@ webapp/install:
 	@if [ -d ${DESTDIR}/usr/local/etc ]; then rm -rf ${DESTDIR}/usr; fi
 
 .PHONY: install
-install: all
-	mkdir -p $(DESTDIR) && cp $(LOCAL_BINDIR)/* $(DESTDIR)
-	mkdir -p $(DESTDIR_WWW) && cp -a webapp/dist/* $(DESTDIR_WWW)
+install:
+	@test -e $(LOCAL_BINDIR)/xds-agent$(EXT) || { 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; }
+	export DESTDIR=$(DESTDIR) && export DESTDIR_WWW=$(DESTDIR_WWW) && $(ROOT_SRCDIR)/scripts/install.sh
+
+.PHONY: uninstall
+uninstall:
+	export DESTDIR=$(DESTDIR) && export DESTDIR_WWW=$(DESTDIR_WWW) && $(ROOT_SRCDIR)/scripts/install.sh uninstall
 
 package: clean tools/syncthing vendor build
-	@mkdir -p $(PACKAGE_DIR)/xds-agent
-	@cp agent-config.json.in $(PACKAGE_DIR)/xds-agent/agent-config.json
+	@mkdir -p $(PACKAGE_DIR)/xds-agent $(PACKAGE_DIR)/scripts
 	@cp -a $(LOCAL_BINDIR)/* $(PACKAGE_DIR)/xds-agent
+	@cp -r $(ROOT_SRCDIR)/conf.d $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/xds-agent
 	cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-agent
 
 .PHONY: package-all
@@ -174,6 +169,7 @@ help:
 	@echo "  build"
 	@echo "  package"
 	@echo "  install"
+	@echo "  uninstall"
 	@echo "  clean"
 	@echo "  distclean"
 	@echo ""