|
@@ -37,24 +37,26 @@ ifneq ($(wildcard $(ROOT)/Makefile.buildvars),)
|
|
|
endif
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
|
|
-VER_ERR_MSG = "Variable PYTHON_VER is $(PYTHON_VER) but it only supports python2.7 or >= python3.5. If not set, defaults to python2.7."
|
|
|
|
|
|
|
+VER_ERR_MSG = "Variable PYTHON_VER is $(PYTHON_VER) but it only supports python2.7 or >= python3.8. If not set, defaults to python2.7."
|
|
|
|
|
|
|
|
PYTHON_VER ?= python2.7
|
|
PYTHON_VER ?= python2.7
|
|
|
PYTHON_EXE = $(shell echo $(PYTHON_VER) | sed "s/\.//")
|
|
PYTHON_EXE = $(shell echo $(PYTHON_VER) | sed "s/\.//")
|
|
|
|
|
+SYS_PIP = "pip2.7"
|
|
|
|
|
|
|
|
$(info "PYTHON_VER is $(PYTHON_VER).")
|
|
$(info "PYTHON_VER is $(PYTHON_VER).")
|
|
|
|
|
|
|
|
ifeq ($(PYTHON_VER),python2.7)
|
|
ifeq ($(PYTHON_VER),python2.7)
|
|
|
$(info "Python 2 module install of desktop/ext-py")
|
|
$(info "Python 2 module install of desktop/ext-py")
|
|
|
EXT_ENV_INSTALL = ext-env-install
|
|
EXT_ENV_INSTALL = ext-env-install
|
|
|
|
|
+ SYS_PIP := $(shell which pip2.7)
|
|
|
else ifeq ($(shell echo $(PYTHON_VER) | head -c 8),python3.)
|
|
else ifeq ($(shell echo $(PYTHON_VER) | head -c 8),python3.)
|
|
|
- $(info "Python 3 module install via pip")
|
|
|
|
|
PYTHON_VER := $(shell echo $(PYTHON_VER) | head -c 9)
|
|
PYTHON_VER := $(shell echo $(PYTHON_VER) | head -c 9)
|
|
|
MINOR_VER = $(shell echo -n $(PYTHON_VER) | tail -c 1)
|
|
MINOR_VER = $(shell echo -n $(PYTHON_VER) | tail -c 1)
|
|
|
- ifeq ($(shell test $(MINOR_VER) -lt 5; echo $$?),0)
|
|
|
|
|
|
|
+ ifeq ($(shell test $(MINOR_VER) -lt 8; echo $$?),0)
|
|
|
$(error "$(VER_ERR_MSG)")
|
|
$(error "$(VER_ERR_MSG)")
|
|
|
endif
|
|
endif
|
|
|
EXT_ENV_INSTALL = ext-env-pip-install
|
|
EXT_ENV_INSTALL = ext-env-pip-install
|
|
|
|
|
+ SYS_PIP := $(shell which pip$(shell echo $(PYTHON_VER) | sed "s/python//g"))
|
|
|
else
|
|
else
|
|
|
$(error "$(VER_ERR_MSG)")
|
|
$(error "$(VER_ERR_MSG)")
|
|
|
endif
|
|
endif
|
|
@@ -140,3 +142,4 @@ PYBABEL := $(ROOT)/build/env/bin/pybabel
|
|
|
##############################
|
|
##############################
|
|
|
REQUIREMENT_FILE := $(ROOT)/desktop/core/requirements.txt
|
|
REQUIREMENT_FILE := $(ROOT)/desktop/core/requirements.txt
|
|
|
NAVOPTAPI_WHL := $(ROOT)/desktop/core/wheels/navoptapi-1.0.0-py3-none-any.whl
|
|
NAVOPTAPI_WHL := $(ROOT)/desktop/core/wheels/navoptapi-1.0.0-py3-none-any.whl
|
|
|
|
|
+BOTO_PKG := $(ROOT)/desktop/core/ext-py3/boto-2.49.0
|