freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] GSoC-2018-nikhil b7e11ab: * builds/freetype.mk: Call python


From: Nikhil Ramakrishnan
Subject: [freetype2] GSoC-2018-nikhil b7e11ab: * builds/freetype.mk: Call python scripts with venv.
Date: Sun, 29 Jul 2018 05:18:42 -0400 (EDT)

branch: GSoC-2018-nikhil
commit b7e11ab44339019af091f7552fbe9a39849d0de3
Author: Nikhil Ramakrishnan <address@hidden>
Commit: Nikhil Ramakrishnan <address@hidden>

    * builds/freetype.mk: Call python scripts with venv.
    
    Call Python scripts with the virtualenv directory created in
    `DOC_DIR/env'. Also ignore the folder in .gitignore.
    
    * builds/freetype.mk (refdoc-venv): Change all calls to local venv.
    
    * docs/reference/.gitignore: Add directory `env/'.
---
 builds/freetype.mk        | 18 ++++++++++++------
 docs/reference/.gitignore |  5 ++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/builds/freetype.mk b/builds/freetype.mk
index 80dabea..83aa52c 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -308,18 +308,24 @@ refdoc:
        cd $(DOC_DIR) && mkdocs build
        @echo Done.
 
+# Variables for running refdoc with Python's `virtualenv'.
+# The env is created in `DOC_DIR/env' and is gitignored.
+# We still need to cd into `DOC_DIR' to build mkdocs because
+# paths in mkdocs.yml are relative to cwd.
+#
 VENV_NAME     := env
-VENV_ACTIVATE := $(VENV_NAME)$(SEP)$(BIN)$(SEP)activate
-PYTHON        := $(VENV_NAME)$(SEP)$(BIN)$(SEP)python
-PIP           := $(VENV_NAME)$(SEP)$(BIN)$(SEP)pip
+IN_VENV       := $(DOC_DIR)$(SEP)$(VENV_NAME)
+VENV_ACTIVATE := $(IN_VENV)$(SEP)$(BIN)$(SEP)activate
+PYTHON        := $(IN_VENV)$(SEP)$(BIN)$(SEP)python
+PIP           := $(IN_VENV)$(SEP)$(BIN)$(SEP)pip
 
 refdoc-venv:
        @echo Setting up virtualenv for Python...
-       virtualenv $(VENV_NAME)
+       virtualenv $(IN_VENV)
        @echo Installing requirements...
        $(PIP) install -r $(SRC_DIR)/tools/docwriter/requirements.txt
        @echo "Running docwriter..."
-       python -B $(SRC_DIR)/tools/docwriter/docwriter.py \
+       $(PYTHON) -B $(SRC_DIR)/tools/docwriter/docwriter.py  \
                   --prefix=ft2                          \
                   --title=FreeType-$(version)           \
                   --output=$(DOC_DIR)                   \
@@ -327,7 +333,7 @@ refdoc-venv:
                   $(PUBLIC_DIR)/config/*.h              \
                   $(PUBLIC_DIR)/cache/*.h
        @echo Building static site...
-       cd $(DOC_DIR) && mkdocs build
+       cd $(DOC_DIR) && $(VENV_NAME)$(SEP)$(BIN)$(SEP)python -m mkdocs build
        @echo Done.
 
 .PHONY: clean_project_std distclean_project_std
diff --git a/docs/reference/.gitignore b/docs/reference/.gitignore
index 5ad4b7e..e245bdc 100644
--- a/docs/reference/.gitignore
+++ b/docs/reference/.gitignore
@@ -6,4 +6,7 @@ site/
 *.md
 
 # MkDocs Config file
-mkdocs.yml
\ No newline at end of file
+mkdocs.yml
+
+# Python virtualenv
+env/



reply via email to

[Prev in Thread] Current Thread [Next in Thread]