diff options
| author |   Sebastien Douheret <sebastien.douheret@iot.bzh> | 2017-05-15 23:42:46 +0200 |
|---|---|---|
| committer | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2017-05-15 23:42:46 +0200 |
| commit | 9f6d0e831bd8fae07118ba26a61f4fdf8e8bc655 (patch) | |
| tree | f85e9021702d4beeeb0df0446bb5e073f9ad0eeb /Makefile | |
| parent | 659d261e05f1b623dcc18e494e4e73a019c75188 (diff) | |
Rework Version and Sub-version setup.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 14 insertions, 9 deletions
@@ -1,14 +1,18 @@ # Makefile used to build XDS daemon Web Server +# Application Version +VERSION := 0.0.1 + # Syncthing version to install -SYNCTHING_VERSION = 0.14.25 +SYNCTHING_VERSION = 0.14.27 SYNCTHING_INOTIFY_VERSION = 0.8.5 + # 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 --tags --always | sed 's/^v//') + ifeq ($(SUB_VERSION), ) + SUB_VERSION=unknown-dev endif endif @@ -42,8 +46,8 @@ all: build webapp build: xds xds:vendor scripts - @echo "### Build XDS server (version $(VERSION))"; - @cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-server -ldflags "-X main.AppVersionGitTag=$(VERSION)" . + @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)" . test: tools/glide go test --race $(shell ./tools/glide novendor) @@ -105,8 +109,9 @@ tools/syncthing: .PHONY: help help: @echo "Main supported rules:" - @echo " build (default)" - @echo " build/xds" + @echo " all (default)" + @echo " build" + @echo " install" @echo " clean" @echo " distclean" @echo "" |