From 04cea3a50855b43eb3febcbc39eaf9b24ea73abc Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 9 Apr 2021 13:38:45 +1000 Subject: Add count argument to ReplaceREInFile so can modify mutiple occurrences. Fixed downloads page. --- doc/ScintillaDownload.html | 6 +++--- scripts/FileGenerator.py | 4 ++-- scripts/LexGen.py | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html index a425f5b05..1739d3dd2 100644 --- a/doc/ScintillaDownload.html +++ b/doc/ScintillaDownload.html @@ -28,7 +28,7 @@ Windows   - + GTK/Linux   @@ -50,8 +50,8 @@ The source code package contains all of the source code for Scintilla but no binary executable code and is available in Instructions for building on both Windows and Linux are included in the readme file.

diff --git a/scripts/FileGenerator.py b/scripts/FileGenerator.py index 9fb32f46a..eb13e0fd5 100644 --- a/scripts/FileGenerator.py +++ b/scripts/FileGenerator.py @@ -214,8 +214,8 @@ def FindSectionInList(lines, markers): raise Exception("Could not find end marker " + markers[2]) return slice(start, end) -def ReplaceREInFile(path, match, replace): +def ReplaceREInFile(path, match, replace, count=1): with codecs.open(path, "r", "utf-8") as f: contents = f.read() - contents = re.sub(match, replace, contents, 1) + contents = re.sub(match, replace, contents, count) UpdateFile(path, contents) diff --git a/scripts/LexGen.py b/scripts/LexGen.py index c638e9878..f40efce04 100644 --- a/scripts/LexGen.py +++ b/scripts/LexGen.py @@ -40,7 +40,8 @@ def UpdateVersionNumbers(sci, root): " Release " + sci.versionDotted) ReplaceREInFile(root / "doc/ScintillaDownload.html", r"/www.scintilla.org/([a-zA-Z]+)\d\d\d", - r"/www.scintilla.org/\g<1>" + sci.version) + r"/www.scintilla.org/\g<1>" + sci.version, + 0) UpdateLineInFile(root / "doc/index.html", ' Release version', ' Release version ' +\ -- cgit v1.2.3