aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexilla/src
diff options
context:
space:
mode:
Diffstat (limited to 'lexilla/src')
-rw-r--r--lexilla/src/DepGen.py6
-rw-r--r--lexilla/src/deps.mak2
-rw-r--r--lexilla/src/lexilla.mak2
-rw-r--r--lexilla/src/makefile4
-rw-r--r--lexilla/src/nmdeps.mak2
5 files changed, 9 insertions, 7 deletions
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 \