From a724e75f6c4baf21c538ff0563f7b9f085e2e6c8 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 7 Dec 2017 14:25:41 -0800 Subject: [PATCH] Defaults Makefile VERSION variable to 0.0.0-dev (#67) When building we should default to a dummy version unless otherwise specified so we don't get ourselves confused over what is official and what is not. Signed-off-by: Eli Uriegas (cherry picked from commit ffcd040b5c3bd4f81e1d1f11c32f9bb81e235ed1) Signed-off-by: Eli Uriegas --- Makefile | 2 +- deb/Makefile | 2 +- rpm/Makefile | 2 +- static/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c5e1f95e53e..b771da48d79 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ SHELL:=/bin/bash ENGINE_DIR:=$(CURDIR)/../engine CLI_DIR:=$(CURDIR)/../cli -VERSION=unknown +VERSION?=0.0.0-dev DOCKER_GITCOMMIT:=abcdefg .PHONY: help clean rpm deb static diff --git a/deb/Makefile b/deb/Makefile index ed5423a46ea..5a2c60712e4 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -3,7 +3,7 @@ ARCH:=$(shell uname -m) ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) -VERSION?=$(shell cat $(ENGINE_DIR)/VERSION) +VERSION?=0.0.0-dev DOCKER_EXPERIMENTAL:=0 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown diff --git a/rpm/Makefile b/rpm/Makefile index 7350ed34207..91588c2e6b3 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -2,7 +2,7 @@ ARCH=$(shell uname -m) ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) -VERSION=$(shell cat $(ENGINE_DIR)/VERSION) +VERSION?=0.0.0-dev DOCKER_EXPERIMENTAL=0 GEN_RPM_VER=$(shell ./gen-rpm-ver $(ENGINE_DIR) $(VERSION)) CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown diff --git a/static/Makefile b/static/Makefile index 6ac4dc1a344..5d07b5862b2 100644 --- a/static/Makefile +++ b/static/Makefile @@ -1,7 +1,7 @@ SHELL:=/bin/bash ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli -VERSION=$(shell cat $(ENGINE_DIR)/VERSION) +VERSION?=0.0.0-dev CHOWN=docker run --rm -v $(CURDIR):/v -w /v alpine chown HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files DIR_TO_HASH:=build/linux