From 42cce3cd687248f821604d875c290088ff81775e Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Mon, 23 Jul 2018 11:58:48 +0200
Subject: [PATCH] Simplifying install, cloning out of repo to avoid sphinx to
 search in cpython sources.

---
 .travis.yml |  5 ++---
 Makefile    | 20 ++++----------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b4338cfd..0c4c5994 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python: 3.6
-install:
-  - git clone --depth 1 --branch 3.7 https://github.com/python/cpython.git
+install: true
 script:
-  - make CPYTHON_CLONE=cpython BRANCH=3.7
+  - make CPYTHON_CLONE=/tmp/cpython/ BRANCH=3.7
diff --git a/Makefile b/Makefile
index eb7104be..7e4d1d3b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,27 +24,15 @@ JOBS = 4
 
 
 .PHONY: all
-all: $(VENV)/bin/sphinx-build $(VENV)/bin/blurb $(SPHINX_CONF)
+all: $(SPHINX_CONF)
 	mkdir -p $(CPYTHON_CLONE)/Doc/locales/$(LANGUAGE)/
 	ln -nfs $(shell readlink -f .) $(CPYTHON_CLONE)/Doc/locales/$(LANGUAGE)/LC_MESSAGES
-	. $(VENV)/bin/activate; $(MAKE) -C $(CPYTHON_CLONE)/Doc/ SPHINXOPTS='-q -j$(JOBS) -D locale_dirs=locales -D language=$(LANGUAGE) -D gettext_compact=0 -D latex_engine=xelatex -D latex_elements.inputenc= -D latex_elements.fontenc=' $(MODE)
+	$(MAKE) -C $(CPYTHON_CLONE)/Doc/ VENVDIR=$(VENV) PYTHON=$(PYTHON) venv
+	$(MAKE) -C $(CPYTHON_CLONE)/Doc/ VENVDIR=$(VENV) PYTHON=$(PYTHON) SPHINXOPTS='-q -j$(JOBS) -D locale_dirs=locales -D language=$(LANGUAGE) -D gettext_compact=0 -D latex_engine=xelatex -D latex_elements.inputenc= -D latex_elements.fontenc=' $(MODE)
 
 
 $(SPHINX_CONF):
-	git clone --depth 1 --no-single-branch https://github.com/python/cpython.git $(CPYTHON_CLONE)
-
-
-$(VENV)/bin/activate:
-	mkdir -p $(VENV)
-	$(PYTHON) -m venv $(VENV)
-
-
-$(VENV)/bin/sphinx-build: $(VENV)/bin/activate
-	. $(VENV)/bin/activate; python3 -m pip install sphinx
-
-
-$(VENV)/bin/blurb: $(VENV)/bin/activate
-	. $(VENV)/bin/activate; python3 -m pip install blurb
+	git clone --depth 1 --no-single-branch --branch $(BRANCH) https://github.com/python/cpython.git $(CPYTHON_CLONE)
 
 
 .PHONY: upgrade_venv