[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: make website fails on platforms where python3 is the default. (issue
From: |
julien . rioux |
Subject: |
Re: make website fails on platforms where python3 is the default. (issue 12769043) |
Date: |
Sat, 17 Aug 2013 12:33:39 +0000 |
Reviewers: janek, Graham Percival,
Message:
On 2013/08/16 04:45:59, Graham Percival wrote:
When building with WEBSITE_ONLY_BUILD, $(PYTHON) will default to
python (as
defined at the top of the file). We do that because we don't run
./configure on
the web server.
I _think_ this will be safe enough, but it might be nice to change the
upper
definition to $(PYTHON) = python2
I did not touch that part specifically because I do not want to break
anything with the current machine that runs this build. Is there a
python2 on the host machine where this command would normally be run?
AFAIK the python2 alias is only installed if python3 is also installed
on the system, which might or might not be the case.
Cheers,
Julien
Description:
make website fails on platforms where python3 is the default.
Use the python found by ./configure to build the website.
Please review this at https://codereview.appspot.com/12769043/
Affected files:
M make/website.make
Index: make/website.make
diff --git a/make/website.make b/make/website.make
index
bf3b2ad865d747ef26375efc3f96e272fa7499a3..3e8df628d564f956f0be839224a947ae082b1c54
100644
--- a/make/website.make
+++ b/make/website.make
@@ -68,11 +68,11 @@ EXTRACT_TEXI_FILENAMES=$(PYTHON)
$(script-dir)/extract_texi_filenames.py $(quiet
-I $(dir $<) \
-I $(OUT) \
-o $(OUT)
-CREATE_VERSION=python $(script-dir)/create-version-itexi.py
-CREATE_WEBLINKS=python $(script-dir)/create-weblinks-itexi.py
-MASS_LINK=python $(script-dir)/mass-link.py
-WEB_POST=python $(script-dir)/website_post.py
-WEB_BIBS=python $(script-dir)/bib2texi.py
+CREATE_VERSION=$(PYTHON) $(script-dir)/create-version-itexi.py
+CREATE_WEBLINKS=$(PYTHON) $(script-dir)/create-weblinks-itexi.py
+MASS_LINK=$(PYTHON) $(script-dir)/mass-link.py
+WEB_POST=$(PYTHON) $(script-dir)/website_post.py
+WEB_BIBS=$(PYTHON) $(script-dir)/bib2texi.py
EXAMPLES=$(LILYPOND_WEB_MEDIA_GIT)/ly-examples
PICTURES=$(LILYPOND_WEB_MEDIA_GIT)/pictures