From a0d2795cb9f2f2af41ce24e296869654c4b99287 Mon Sep 17 00:00:00 2001 From: mitchell Date: Sat, 30 Jun 2018 09:18:26 -0400 Subject: Updated for 3.10.0. --- cocoa/ScintillaFramework/Info.plist | 4 ++-- doc/ScintillaDownload.html | 10 +++++----- doc/ScintillaHistory.html | 19 +++++++++++++++++-- doc/index.html | 2 +- qt/ScintillaEdit/ScintillaEdit.pro | 2 +- qt/ScintillaEditBase/ScintillaEditBase.pro | 2 +- scripts/LexGen.py | 2 +- scripts/ScintillaData.py | 14 ++++++++++---- version.txt | 2 +- win32/ScintRes.rc | 4 ++-- 10 files changed, 41 insertions(+), 20 deletions(-) diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist index f88e0df48..c59ac9441 100644 --- a/cocoa/ScintillaFramework/Info.plist +++ b/cocoa/ScintillaFramework/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.8.0 + 3.10.0 CFBundleSignature ???? CFBundleVersion - 3.8.0 + 3.10.0 NSPrincipalClass diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html index 302f8bd70..c363a1fe2 100644 --- a/doc/ScintillaDownload.html +++ b/doc/ScintillaDownload.html @@ -26,9 +26,9 @@ @@ -42,7 +42,7 @@ containing very few restrictions.

- Release 3.8.0 + Release 3.10.0

Source Code @@ -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/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index e91c51501..28140a649 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -536,11 +536,11 @@

- Release 3.? + Release 3.10.0

- + Windows   - + GTK+/Linux   - Release version 3.8.0
+ Release version 3.10.0
Site last modified February 12 2018 		diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index dc09f2738..f9401b0c8 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -20,7 +20,7 @@ unix { } } -VERSION = 3.8.0 +VERSION = 3.10.0 SOURCES += \ ScintillaEdit.cpp \ diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index 00d972577..683bce111 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -19,7 +19,7 @@ unix { } } -VERSION = 3.8.0 +VERSION = 3.10.0 SOURCES += \ PlatQt.cpp \ diff --git a/scripts/LexGen.py b/scripts/LexGen.py index ae7ae99d5..261cb7ee1 100644 --- a/scripts/LexGen.py +++ b/scripts/LexGen.py @@ -29,7 +29,7 @@ def UpdateVersionNumbers(sci, root): UpdateLineInFile(root + "doc/ScintillaDownload.html", " Release", " Release " + sci.versionDotted) ReplaceREInFile(root + "doc/ScintillaDownload.html", - r"/www.scintilla.org/([a-zA-Z]+)\d\d\d", + r"/www.scintilla.org/([a-zA-Z]+)\d\d\d\d?", r"/www.scintilla.org/\g<1>" + sci.version) UpdateLineInFile(root + "doc/index.html", ' Release version', diff --git a/scripts/ScintillaData.py b/scripts/ScintillaData.py index 0ac1eddfa..385db59af 100644 --- a/scripts/ScintillaData.py +++ b/scripts/ScintillaData.py @@ -195,10 +195,16 @@ class ScintillaData: # Discover verion information with open(scintillaRoot + "version.txt") as f: self.version = f.read().strip() - self.versionDotted = self.version[0] + '.' + self.version[1] + '.' + \ - self.version[2] - self.versionCommad = self.version[0] + ', ' + self.version[1] + ', ' + \ - self.version[2] + ', 0' + if len(self.version) == 3: + self.versionDotted = self.version[0] + '.' + self.version[1] + '.' + \ + self.version[2] + self.versionCommad = self.version[0] + ', ' + self.version[1] + ', ' + \ + self.version[2] + ', 0' + else: + self.versionDotted = self.version[0] + '.' + self.version[1:3] + '.' + \ + self.version[3] + self.versionCommad = self.version[0] + ', ' + self.version[1:3] + ', ' + \ + self.version[3] + ', 0' with open(scintillaRoot + "doc/index.html") as f: self.dateModified = [l for l in f.readlines() if "Date.Modified" in l]\ diff --git a/version.txt b/version.txt index c2f531175..d9d811cb3 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -380 +3100 diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc index f25971bfc..742cccdba 100644 --- a/win32/ScintRes.rc +++ b/win32/ScintRes.rc @@ -4,8 +4,8 @@ #include -#define VERSION_SCINTILLA "3.8.0" -#define VERSION_WORDS 3, 8, 0, 0 +#define VERSION_SCINTILLA "3.10.0" +#define VERSION_WORDS 3, 10, 0, 0 VS_VERSION_INFO VERSIONINFO FILEVERSION VERSION_WORDS -- cgit v1.2.3