diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-04-17 15:29:20 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-04-17 15:29:20 +1000 |
| commit | 9e2bd8b981c5d6891b7e0bf9418fd70aceff9602 (patch) | |
| tree | 5c46fd80e54c2fe5bfa1f5e006cfa065850a0811 /win32 | |
| parent | 8c45e7db05d76de60d214148a69b5ba927b704a1 (diff) | |
| download | scintilla-mirror-9e2bd8b981c5d6891b7e0bf9418fd70aceff9602.tar.gz | |
Making dependencies now requires Python 3.6+.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/DepGen.py | 6 | ||||
| -rw-r--r-- | win32/deps.mak | 2 | ||||
| -rw-r--r-- | win32/makefile | 4 | ||||
| -rw-r--r-- | win32/nmdeps.mak | 2 | ||||
| -rw-r--r-- | win32/scintilla.mak | 2 |
5 files changed, 9 insertions, 7 deletions
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=\ |