Skip to content

Commit f3e5b99

Browse files
committed
Update Makefile.
1 parent 5f1ade5 commit f3e5b99

File tree

1 file changed

+27
-6
lines changed

1 file changed

+27
-6
lines changed

Makefile

+27-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,26 @@ VIRTUALENV_DIR ?= virtualenv
44
ST2_REPO_PATH ?= /tmp/st2
55
ST2_REPO_BRANCH ?= master
66

7-
export ST2_REPO_PATH
7+
ifneq (,$(wildcard /etc/debian_version))
8+
DEBIAN := 1
9+
DEB_DISTRO := $(shell lsb_release -cs)
10+
else
11+
REDHAT := 1
12+
DEB_DISTRO := unstable
13+
endif
14+
15+
ifeq ($(DEB_DISTRO),bionic)
16+
PYTHON_BINARY := /usr/bin/python3
17+
PIP_BINARY := /usr/local/bin/pip3
18+
else
19+
PYTHON_BINARY := python
20+
PIP_BINARY := pip
21+
endif
22+
23+
# NOTE: We remove trailing "0" which is added at the end by newer versions of pip
24+
# For example: 3.0.dev0 -> 3.0.dev
25+
PKG_VERSION := $(shell $(PYTHON_BINARY) setup.py --version 2> /dev/null | sed 's/\.dev[0-9]$$/dev/')
26+
CHANGELOG_COMMENT ?= "automated build, version: $(PKG_VERSION)"
827

928
# nasty hack to get a space into a variable
1029
colon := :
@@ -46,16 +65,18 @@ endif
4665
# Target for debugging Makefile variable assembly
4766
.PHONY: play
4867
play:
49-
@echo COMPONENTS=$(COMPONENTS)
68+
@echo "DEBIAN=$(DEBIAN)"
69+
@echo "REDHAT=$(REDHAT)"
70+
@echo "DEB_DISTRO=$(DEB_DISTRO)"
71+
@echo "PYTHON_BINARY=$(PYTHON_BINARY)"
72+
@echo "PIP_BINARY=$(PIP_BINARY)"
73+
@echo "PKG_VERSION=$(PKG_VERSION)"
5074
@echo
75+
@echo COMPONENTS=$(COMPONENTS)
5176
@echo COMPONENTS_RUNNERS=$(COMPONENTS_RUNNERS)
52-
@echo
5377
@echo COMPONENTS_WITH_RUNNERS=$(COMPONENTS_WITH_RUNNERS)
54-
@echo
5578
@echo COMPONENT_PYTHONPATH=$(COMPONENT_PYTHONPATH)
56-
@echo
5779
@echo TRAVIS_PULL_REQUEST=$(TRAVIS_PULL_REQUEST)
58-
@echo
5980
@echo NOSE_OPTS=$(NOSE_OPTS)
6081
@echo
6182

0 commit comments

Comments
 (0)