Making dependencies now requires Python 3.6+.

13 files changed, 25 insertions, 19 deletions

diff --git a/gtk/DepGen.py b/gtk/DepGen.py
index 4feea8a9c..39d9bd358 100644
--- a/gtk/DepGen.py
+++ b/gtk/DepGen.py
@@ -1,8 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # DepGen.py - produce a make dependencies file for Scintilla
 # Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
 # The License.txt file describes the conditions under which this software may be distributed.
-# Requires Python 2.7 or later
+# Requires Python 3.6 or later
 
 import sys
 
@@ -10,7 +10,7 @@ sys.path.append("..")
 
 from scripts import Dependencies
 
-topComment = "# Created by DepGen.py. To recreate, run 'python DepGen.py'.\n"
+topComment = "# Created by DepGen.py. To recreate, run DepGen.py.\n"
 
 def Generate():
 	sources = ["../src/*.cxx", "../lexlib/*.cxx", "../lexers/*.cxx"]
diff --git a/gtk/deps.mak b/gtk/deps.mak
index 6ba5eff2e..f6d45de7b 100644
--- a/gtk/deps.mak
+++ b/gtk/deps.mak
@@ -1,4 +1,4 @@
-# Created by DepGen.py. To recreate, run 'python DepGen.py'.
+# Created by DepGen.py. To recreate, run DepGen.py.
 PlatGTK.o: \
 	PlatGTK.cxx \
 	../include/Platform.h \
diff --git a/gtk/makefile b/gtk/makefile
index cde17ea80..00f902517 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -52,6 +52,8 @@ endif
 # Take care of changing Unix style '/' directory separator to '\' on Windows
 normalize = $(if $(windir),$(subst /,\,$1),$1)
 
+PYTHON = $(if $(windir),pyw,python3)
+
 ifdef windir
 CC = gcc
 DEL = del /q
@@ -103,7 +105,7 @@ analyze:
 	clang --analyze $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(CXX_BASE_FLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(basedir)/src/*.cxx $(basedir)/lexlib/*.cxx $(basedir)/lexers/*.cxx
 
 depend deps.mak:
-	python DepGen.py
+	$(PYTHON) DepGen.py
 
 LEX_OBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(basedir)/lexers/Lex*.cxx)))))
 
diff --git a/lexilla/src/DepGen.py b/lexilla/src/DepGen.py
index 08d80b28e..86cbb3bff 100644
--- a/lexilla/src/DepGen.py
+++ b/lexilla/src/DepGen.py
@@ -1,8 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # DepGen.py - produce a make dependencies file for Scintilla
 # Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
 # The License.txt file describes the conditions under which this software may be distributed.
-# Requires Python 2.7 or later
+# Requires Python 3.6 or later
 
 import os, sys
 
@@ -10,7 +10,7 @@ sys.path.append(os.path.join("..", ".."))
 
 from scripts import Dependencies
 
-topComment = "# Created by DepGen.py. To recreate, run 'python DepGen.py'.\n"
+topComment = "# Created by DepGen.py. To recreate, run DepGen.py.\n"
 
 def Generate():
 	scintilla = os.path.join("..", "..")
diff --git a/lexilla/src/deps.mak b/lexilla/src/deps.mak
index ae10b42c4..8c3c33c79 100644
--- a/lexilla/src/deps.mak
+++ b/lexilla/src/deps.mak
@@ -1,4 +1,4 @@
-# Created by DepGen.py. To recreate, run 'python DepGen.py'.
+# Created by DepGen.py. To recreate, run DepGen.py.
 Lexilla.o: \
 	../../lexilla/src/Lexilla.cxx \
 	../../include/ILexer.h \
diff --git a/lexilla/src/lexilla.mak b/lexilla/src/lexilla.mak
index 93b71cdc3..045317e73 100644
--- a/lexilla/src/lexilla.mak
+++ b/lexilla/src/lexilla.mak
@@ -52,7 +52,7 @@ clean:
 	$(LEXILLA) $(LIBLEXILLA)
 
 depend:
-	python DepGen.py
+	pyw DepGen.py
 
 #++Autogenerated -- run scripts/LexGen.py to regenerate
 #**LEX_OBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\)
diff --git a/lexilla/src/makefile b/lexilla/src/makefile
index a8edfc1cb..4560a6d14 100644
--- a/lexilla/src/makefile
+++ b/lexilla/src/makefile
@@ -55,6 +55,8 @@ endif
 # Take care of changing Unix style '/' directory separator to '\' on Windows
 normalize = $(if $(windir),$(subst /,\,$1),$1)
 
+PYTHON = $(if $(windir),pyw,python3)
+
 ifdef windir
     DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q)
 else
@@ -89,7 +91,7 @@ analyze:
 	$(CXX) --analyze $(DEFINES) $(INCLUDES) $(BASE_FLAGS) $(CXXFLAGS) *.cxx ../../lexlib/*.cxx ../../lexers/*.cxx
 
 depend deps.mak:
-	python DepGen.py
+	$(PYTHON) DepGen.py
 
 LEXERS:=$(sort $(notdir $(wildcard ../../lexers/Lex*.cxx)))
 
diff --git a/lexilla/src/nmdeps.mak b/lexilla/src/nmdeps.mak
index 50b7b3a30..d35ef8852 100644
--- a/lexilla/src/nmdeps.mak
+++ b/lexilla/src/nmdeps.mak
@@ -1,4 +1,4 @@
-# Created by DepGen.py. To recreate, run 'python DepGen.py'.
+# Created by DepGen.py. To recreate, run DepGen.py.
 $(DIR_O)/Lexilla.obj: \
 	../../lexilla/src/Lexilla.cxx \
 	../../include/ILexer.h \
diff --git a/win32/DepGen.py b/win32/DepGen.py
index 6196720e2..563cae2a1 100644
--- a/win32/DepGen.py
+++ b/win32/DepGen.py
@@ -1,8 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # DepGen.py - produce a make dependencies file for Scintilla
 # Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
 # The License.txt file describes the conditions under which this software may be distributed.
-# Requires Python 2.7 or later
+# Requires Python 3.6 or later
 
 import sys
 
@@ -10,7 +10,7 @@ sys.path.append("..")
 
 from scripts import Dependencies
 
-topComment = "# Created by DepGen.py. To recreate, run 'python DepGen.py'.\n"
+topComment = "# Created by DepGen.py. To recreate, run DepGen.py.\n"
 
 def Generate():
 	sources = ["../src/*.cxx", "../lexlib/*.cxx", "../lexers/*.cxx"]
diff --git a/win32/deps.mak b/win32/deps.mak
index f3a6771d2..adacc965c 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -1,4 +1,4 @@
-# Created by DepGen.py. To recreate, run 'python DepGen.py'.
+# Created by DepGen.py. To recreate, run DepGen.py.
 HanjaDic.o: \
 	HanjaDic.cxx \
 	../src/UniConversion.h \
diff --git a/win32/makefile b/win32/makefile
index 2442ca65e..8b17cbcc8 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -34,6 +34,8 @@ WINDRES ?= windres
 # Take care of changing Unix style '/' directory separator to '\' on Windows
 normalize = $(if $(windir),$(subst /,\,$1),$1)
 
+PYTHON = $(if $(windir),pyw,python3)
+
 ifdef windir
 DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q)
 else
@@ -76,7 +78,7 @@ analyze:
 	$(CXX) --analyze $(CXX_ALL_FLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx
 
 depend deps.mak:
-	python DepGen.py
+	$(PYTHON) DepGen.py
 
 LEX_OBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard ../lexers/Lex*.cxx)))))
 
diff --git a/win32/nmdeps.mak b/win32/nmdeps.mak
index 643615584..7d51e164e 100644
--- a/win32/nmdeps.mak
+++ b/win32/nmdeps.mak
@@ -1,4 +1,4 @@
-# Created by DepGen.py. To recreate, run 'python DepGen.py'.
+# Created by DepGen.py. To recreate, run DepGen.py.
 $(DIR_O)/HanjaDic.obj: \
 	HanjaDic.cxx \
 	../src/UniConversion.h \
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 6862bc561..3277b550c 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -71,7 +71,7 @@ clean:
 	$(DIR_BIN)\Scintilla.lib $(DIR_BIN)\SciLexer.lib $(LIBSCI)
 
 depend:
-	python DepGen.py
+	pyw DepGen.py
 
 # Required for base Scintilla
 SRC_OBJS=\