|
@@ -78,8 +78,6 @@
|
|
|
###################################
|
|
###################################
|
|
|
ROOT := $(realpath .)
|
|
ROOT := $(realpath .)
|
|
|
PPC64LE := $(shell uname -m)
|
|
PPC64LE := $(shell uname -m)
|
|
|
-VIRTUAL_ENV_VERSION := 20.24.4
|
|
|
|
|
-VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
|
|
|
|
|
|
|
|
|
|
include $(ROOT)/Makefile.vars.priv
|
|
include $(ROOT)/Makefile.vars.priv
|
|
|
|
|
|
|
@@ -133,30 +131,11 @@ endif
|
|
|
###################################
|
|
###################################
|
|
|
|
|
|
|
|
.PHONY: virtual-env
|
|
.PHONY: virtual-env
|
|
|
-virtual-env: virtual-env2.7 virtual-env3.8 virtual-env3.9
|
|
|
|
|
-
|
|
|
|
|
-.PHONY: virtual-env2.7
|
|
|
|
|
-virtual-env2.7: $(BLD_DIR_ENV)/stamp
|
|
|
|
|
-$(BLD_DIR_ENV)/stamp:
|
|
|
|
|
-ifeq ($(PYTHON_VER),python2.7)
|
|
|
|
|
- @echo "--- Creating virtual environment at $(BLD_DIR_ENV) using $(PYTHON_VER)"
|
|
|
|
|
- @$(SYS_PYTHON) $(VIRTUAL_BOOTSTRAP) $(VIRTUALENV_OPTS) --system-site-packages $(BLD_DIR_ENV)
|
|
|
|
|
- @echo "--- Virtual environment $(BLD_DIR_ENV) ready"
|
|
|
|
|
- @touch $@
|
|
|
|
|
- @echo '--- Installing PIP_MODULES in virtual-env'
|
|
|
|
|
- @echo "--- start installing PIP_MODULES in virtual-env"
|
|
|
|
|
- @$(ENV_PIP) install --upgrade pip
|
|
|
|
|
- @$(ENV_PIP) install --upgrade --force-reinstall $(PIP_MODULES)
|
|
|
|
|
- @echo "--- done installing PIP_MODULES in virtual-env"
|
|
|
|
|
-endif
|
|
|
|
|
-
|
|
|
|
|
-.PHONY: virtual-env3.8
|
|
|
|
|
-virtual-env3.8: $(BLD_DIR_ENV)/stamp
|
|
|
|
|
|
|
+virtual-env: $(BLD_DIR_ENV)/stamp
|
|
|
$(BLD_DIR_ENV)/stamp:
|
|
$(BLD_DIR_ENV)/stamp:
|
|
|
-ifeq ($(PYTHON_VER),python3.8)
|
|
|
|
|
@echo "--- Creating virtual environment at $(BLD_DIR_ENV) using $(PYTHON_VER)"
|
|
@echo "--- Creating virtual environment at $(BLD_DIR_ENV) using $(PYTHON_VER)"
|
|
|
- @$(SYS_PYTHON) -m pip install --upgrade pip==22.2.2
|
|
|
|
|
- @$(SYS_PIP) install virtualenv==$(VIRTUAL_ENV_VERSION) virtualenv-make-relocatable==$(VIRTUAL_ENV_RELOCATABLE_VERSION)
|
|
|
|
|
|
|
+ @$(SYS_PYTHON) -m pip install --upgrade pip==$(PIP_VERSION)
|
|
|
|
|
+ $(SYS_PIP) install virtualenv==$(VIRTUAL_ENV_VERSION) virtualenv-make-relocatable==$(VIRTUAL_ENV_RELOCATABLE_VERSION)
|
|
|
@if [[ "ppc64le" == $(PPC64LE) ]]; then \
|
|
@if [[ "ppc64le" == $(PPC64LE) ]]; then \
|
|
|
$(SYS_PYTHON) -m venv $(BLD_DIR_ENV); \
|
|
$(SYS_PYTHON) -m venv $(BLD_DIR_ENV); \
|
|
|
fi
|
|
fi
|
|
@@ -176,35 +155,6 @@ ifeq ($(PYTHON_VER),python3.8)
|
|
|
@$(ENV_PIP) install $(NAVOPTAPI_WHL)
|
|
@$(ENV_PIP) install $(NAVOPTAPI_WHL)
|
|
|
@echo '--- Finished $(NAVOPTAPI_WHL) into virtual-env'
|
|
@echo '--- Finished $(NAVOPTAPI_WHL) into virtual-env'
|
|
|
@touch $(REQUIREMENT_DOT_FILE)
|
|
@touch $(REQUIREMENT_DOT_FILE)
|
|
|
-endif
|
|
|
|
|
-
|
|
|
|
|
-.PHONY: virtual-env3.9
|
|
|
|
|
-virtual-env3.9: $(BLD_DIR_ENV)/stamp
|
|
|
|
|
-$(BLD_DIR_ENV)/stamp:
|
|
|
|
|
-ifeq ($(PYTHON_VER),python3.9)
|
|
|
|
|
- @echo "--- Creating virtual environment at $(BLD_DIR_ENV) using $(PYTHON_VER)"
|
|
|
|
|
- @$(SYS_PYTHON) -m pip install --upgrade pip==22.2.2
|
|
|
|
|
- @$(SYS_PIP) install virtualenv==20.19.0 virtualenv-make-relocatable==0.0.1
|
|
|
|
|
- @if [[ "ppc64le" == $(PPC64LE) ]]; then \
|
|
|
|
|
- $(SYS_PYTHON) -m venv $(BLD_DIR_ENV); \
|
|
|
|
|
- fi
|
|
|
|
|
- @virtualenv -p $(PYTHON_VER) $(BLD_DIR_ENV)
|
|
|
|
|
- @echo "--- Virtual environment $(BLD_DIR_ENV) ready"
|
|
|
|
|
- @touch $@
|
|
|
|
|
- @echo '--- Installing PIP_MODULES in virtual-env'
|
|
|
|
|
- @if [[ "ppc64le" == $(PPC64LE) ]]; then \
|
|
|
|
|
- echo '--- Installing $(REQUIREMENT_PPC64LE_FILE_PY39) into virtual-env via $(ENV_PIP)'; \
|
|
|
|
|
- $(ENV_PIP) install -r $(REQUIREMENT_PPC64LE_FILE_PY39); \
|
|
|
|
|
- echo '--- Finished $(REQUIREMENT_PPC64LE_FILE_PY39) into virtual-env'; \
|
|
|
|
|
- else \
|
|
|
|
|
- echo '--- Installing $(REQUIREMENT_FILE) into virtual-env via $(ENV_PIP)'; \
|
|
|
|
|
- $(ENV_PIP) install -r $(REQUIREMENT_FILE); \
|
|
|
|
|
- echo '--- Finished $(REQUIREMENT_FILE) into virtual-env'; \
|
|
|
|
|
- fi
|
|
|
|
|
- @$(ENV_PIP) install $(NAVOPTAPI_WHL)
|
|
|
|
|
- @echo '--- Finished $(NAVOPTAPI_WHL) into virtual-env'
|
|
|
|
|
- @touch $(REQUIREMENT_DOT_FILE)
|
|
|
|
|
-endif
|
|
|
|
|
###################################
|
|
###################################
|
|
|
# Build desktop
|
|
# Build desktop
|
|
|
###################################
|
|
###################################
|
|
@@ -234,7 +184,6 @@ INSTALL_CORE_FILES = \
|
|
|
ext \
|
|
ext \
|
|
|
tools/app_reg \
|
|
tools/app_reg \
|
|
|
tools/virtual-bootstrap \
|
|
tools/virtual-bootstrap \
|
|
|
- tools/enable-python27.sh \
|
|
|
|
|
tools/relocatable.sh \
|
|
tools/relocatable.sh \
|
|
|
VERS* LICENSE* README*
|
|
VERS* LICENSE* README*
|
|
|
|
|
|