|
@@ -44,12 +44,14 @@ PYTHON_EXE = $(shell echo $(PYTHON_VER) | sed "s/\.//")
|
|
|
|
|
|
|
|
ifeq ($(PYTHON_VER),python2.7)
|
|
ifeq ($(PYTHON_VER),python2.7)
|
|
|
$(info "PYTHNON_VER is $(PYTHON_VER)")
|
|
$(info "PYTHNON_VER is $(PYTHON_VER)")
|
|
|
|
|
+ EXT_ENV_INSTALL = ext-env-install
|
|
|
else ifeq ($(shell echo $(PYTHON_VER) | head -c 8),python3.)
|
|
else ifeq ($(shell echo $(PYTHON_VER) | head -c 8),python3.)
|
|
|
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 5; echo $$?),0)
|
|
|
$(error "$(VER_ERR_MSG)")
|
|
$(error "$(VER_ERR_MSG)")
|
|
|
endif
|
|
endif
|
|
|
|
|
+ EXT_ENV_INSTALL = ext-env-pip-install
|
|
|
else
|
|
else
|
|
|
$(error "$(VER_ERR_MSG)")
|
|
$(error "$(VER_ERR_MSG)")
|
|
|
endif
|
|
endif
|
|
@@ -97,6 +99,7 @@ ENV_PYTHON_VERSION = $(shell $(ENV_PYTHON) -c 'import sys; print ("python%d.%d"%
|
|
|
# doesn't arise.
|
|
# doesn't arise.
|
|
|
##############################
|
|
##############################
|
|
|
ENV_EASY_INSTALL := $(ENV_PYTHON) $(BLD_DIR_BIN)/easy_install
|
|
ENV_EASY_INSTALL := $(ENV_PYTHON) $(BLD_DIR_BIN)/easy_install
|
|
|
|
|
+ENV_PIP := $(ENV_PYTHON) $(BLD_DIR_BIN)/pip
|
|
|
|
|
|
|
|
##############################
|
|
##############################
|
|
|
# This version is substituted through to the tarballs and packages.
|
|
# This version is substituted through to the tarballs and packages.
|
|
@@ -114,3 +117,4 @@ DB_PROXY_JAR := $(ROOT)/desktop/libs/librdbms/java-lib/dbproxy-1.0.jar
|
|
|
# Internationalization
|
|
# Internationalization
|
|
|
################################################
|
|
################################################
|
|
|
PYBABEL := $(ROOT)/build/env/bin/pybabel
|
|
PYBABEL := $(ROOT)/build/env/bin/pybabel
|
|
|
|
|
+REQUIREMENT_FILE := $(ROOT)/desktop/core/requirements_py3.txt
|