[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] GSoC-2018-nikhil 13ad839: * builds/unix/configure.raw: Chang
From: |
Nikhil Ramakrishnan |
Subject: |
[freetype2] GSoC-2018-nikhil 13ad839: * builds/unix/configure.raw: Change order of checking for Python. |
Date: |
Wed, 1 Aug 2018 16:17:05 -0400 (EDT) |
branch: GSoC-2018-nikhil
commit 13ad839007057eab40522f4a3d8dc244199c7acc
Author: Nikhil Ramakrishnan <address@hidden>
Commit: Nikhil Ramakrishnan <address@hidden>
* builds/unix/configure.raw: Change order of checking for Python.
Check for Python and pip in the order p3, p2, p so that we use the same
version of Python *and* pip at any given point of time.
* builds/freetype.mk: Minor formatting.
---
builds/freetype.mk | 28 ++++++++++++++--------------
builds/unix/configure.raw | 4 ++--
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/builds/freetype.mk b/builds/freetype.mk
index 46a307d..83b371c 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -299,13 +299,13 @@ PIP ?= pip
refdoc:
@echo Running docwriter...
- $(PYTHON) -m docwriter \
- --prefix=ft2 \
- --title=FreeType-$(version) \
- --output=$(DOC_DIR) \
- $(PUBLIC_DIR)/*.h \
- $(PUBLIC_DIR)/config/*.h \
- $(PUBLIC_DIR)/cache/*.h
+ $(PYTHON) -m docwriter \
+ --prefix=ft2 \
+ --title=FreeType-$(version) \
+ --output=$(DOC_DIR) \
+ $(PUBLIC_DIR)/*.h \
+ $(PUBLIC_DIR)/config/*.h \
+ $(PUBLIC_DIR)/cache/*.h
@echo Building static site...
cd $(DOC_DIR) && mkdocs build
@echo Done.
@@ -326,13 +326,13 @@ refdoc-venv:
@echo Installing docwriter...
$(ENV_PIP) install docwriter
@echo Running docwriter...
- $(ENV_PYTHON) -m docwriter \
- --prefix=ft2 \
- --title=FreeType-$(version) \
- --output=$(DOC_DIR) \
- $(PUBLIC_DIR)/*.h \
- $(PUBLIC_DIR)/config/*.h \
- $(PUBLIC_DIR)/cache/*.h
+ $(ENV_PYTHON) -m docwriter \
+ --prefix=ft2 \
+ --title=FreeType-$(version) \
+ --output=$(DOC_DIR) \
+ $(PUBLIC_DIR)/*.h \
+ $(PUBLIC_DIR)/config/*.h \
+ $(PUBLIC_DIR)/cache/*.h
@echo Building static site...
cd $(DOC_DIR) && $(VENV_NAME)$(SEP)$(BIN)$(SEP)python -m mkdocs build
@echo Done.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index aa67f86..d59437e 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -970,10 +970,10 @@ esac
# Check for python and docwriter
-AC_CHECK_PROGS([PYTHON], [python python2 python3], [missing])
+AC_CHECK_PROGS([PYTHON], [python3 python2 python], [missing])
have_docwriter=no
if test "x$PYTHON" != "xmissing"; then
- AC_CHECK_PROGS([PIP], [pip pip2 pip3], [missing])
+ AC_CHECK_PROGS([PIP], [pip3 pip2 pip], [missing])
if test "x$PIP" != "xmissing"; then
AC_MSG_CHECKING([for \`docwriter' Python module])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] GSoC-2018-nikhil 13ad839: * builds/unix/configure.raw: Change order of checking for Python.,
Nikhil Ramakrishnan <=