From ec608afb338fd77c5c3934bf3ec49fadafbc54b8 Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Mon, 22 Jul 2024 10:32:28 +0200 Subject: [PATCH] winpython fixes and fix pdf-outline generation on gentoo using a temporary python env --- Handbook/GNUmakefile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Handbook/GNUmakefile b/Handbook/GNUmakefile index 2e88dec3..6dc8970a 100644 --- a/Handbook/GNUmakefile +++ b/Handbook/GNUmakefile @@ -182,15 +182,20 @@ else # ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) $(error The target operating system is not supported!) endif # ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) -ifeq ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_WINDOWS)) SG_DIST_DIR := $(SG_HANDBOOK_DIR)/dist -SG_WINPYTHON_DIR := $(SG_DIST_DIR)/WINPYTHON -SG_WINPYTHON_BIN_DIR := $(SG_DIST_DIR)/WINPYTHON/python-3.12.4.amd64 +ifeq ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) +SG_PYTHON_VENV_DIR := $(shell mktemp -d)/sg-ue-handbook-venv +SG_PYTHON_VENV_BIN_DIR := $(SG_PYTHON_VENV_DIR)/bin +export PATH := $(SG_GENTOO_PY_VENV_BIN_DIR):$(PATH) +export PWD := $(SG_GENTOO_PY_VENV_BIN_DIR) +export VIRTUAL_ENV := $(SG_GENTOO_PY_VENV_DIR) +else ifeq ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_WINDOWS)) +SG_WINPYTHON_DIR := $(SG_DIST_DIR)/winpython +SG_WINPYTHON_BIN_DIR := $(SG_WINPYTHON_DIR)//python-3.12.4.amd64 SG_WINPYTHON_BIN_SCRIPTS_DIR := $(SG_WINPYTHON_BIN_DIR)/Scripts -SG_WINPYTHON_SCRIPTS_DIR := $(SG_DIST_DIR)/scripts - +SG_WINPYTHON_SCRIPTS_DIR := $(SG_WINPYTHON_DIR)/scripts export PATH := $(SG_WINPYTHON_BIN_DIR);$(SG_WINPYTHON_BIN_SCRIPTS_DIR);$(SG_WINPYTHON_SCRIPTS_DIR);$(PATH) -endif # ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_WINDOWS)) +endif # ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) ################################################################################ # Make Targets - All