Updates for 4.4.2.rel-4-4-2

14 files changed, 49 insertions, 26 deletions

diff --git a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
index e45574055..34128ff99 100644
--- a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
+++ b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
@@ -640,7 +640,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 4.4.0;
+				CURRENT_PROJECT_VERSION = 4.4.2;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -701,7 +701,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 4.4.0;
+				CURRENT_PROJECT_VERSION = 4.4.2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -730,7 +730,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4.4.0;
+				CURRENT_PROJECT_VERSION = 4.4.2;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -765,7 +765,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4.4.0;
+				CURRENT_PROJECT_VERSION = 4.4.2;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/cocoa/Scintilla/Scintilla/Info.plist b/cocoa/Scintilla/Scintilla/Info.plist
index 9fa164497..6032125f0 100644
--- a/cocoa/Scintilla/Scintilla/Info.plist
+++ b/cocoa/Scintilla/Scintilla/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4.0</string>
+	<string>4.4.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index 0b9e90283..4282a985d 100644
--- a/cocoa/ScintillaFramework/Info.plist
+++ b/cocoa/ScintillaFramework/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4.0</string>
+	<string>4.4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.4.0</string>
+	<string>4.4.2</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 496050d48..923ebdb0a 100644
--- a/doc/ScintillaDownload.html
+++ b/doc/ScintillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scintilla440.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla442.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla440.tgz">
+	<a href="https://www.scintilla.org/scintilla442.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 4.4.0
+       Release 4.4.2
     </h3>
     <h4>
        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
        <ul>
-       <li><a href="https://www.scintilla.org/scintilla440.zip">zip format</a> (1.8M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla440.tgz">tgz format</a> (1.5M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla442.zip">zip format</a> (1.8M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla442.tgz">tgz format</a> (1.5M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 63876e3f3..9ef642d65 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -566,6 +566,28 @@
       </li>
     </ul>
     <h3>
+       <a href="https://www.scintilla.org/scite442.zip">Release 4.4.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 June 2020.
+	</li>
+	<li>
+	On Cocoa using Xcode changed Lexilla.dylib install path to @rpath as would otherwise try /usr/lib which
+	won't work for sandboxed applications.
+	</li>
+	<li>
+	On Cocoa using Xcode made work on old versions of macOS by specifying deployment target as 10.8
+	instead of 10.15.
+	</li>
+	<li>
+	On Win32 fix static linking of Lexilla by specifying calling convention in Lexilla.h.
+	</li>
+	<li>
+	SciTE now uses default shared library extension even when directory contains '.'.
+	</li>
+    </ul>
+    <h3>
        <a href="https://www.scintilla.org/scite440.zip">Release 4.4.0</a>
     </h3>
     <ul>
diff --git a/doc/index.html b/doc/index.html
index 493caa4de..4cf3f0f27 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20200601" />
+    <meta name="Date.Modified" content="20200602" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         #versionlist {
@@ -56,8 +56,8 @@
           GTK, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 4.4.0<br />
-           Site last modified June 1 2020</font>
+          <font color="#FFCC99" size="3"> Release version 4.4.2<br />
+           Site last modified June 2 2020</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,6 +72,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 4.4.2 fixes Lexilla build problems with Xcode and as a static library on Win32.</li>
       <li>Version 4.4.0 builds Scintilla without lexers as a shared library for GTK,
       and adds Xcode projects for Scintilla without lexers and Lexilla on macOS.</li>
       <li>Version 4.3.3 adds methods for iterating marker handles and marker numbers on a line.</li>
diff --git a/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj b/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
index cdc074fbb..e8c4db319 100644
--- a/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
+++ b/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
@@ -816,7 +816,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4.4.0;
+				CURRENT_PROJECT_VERSION = 4.4.2;
 				DEVELOPMENT_TEAM = 4F446KW87E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -841,7 +841,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4.4.0;
+				CURRENT_PROJECT_VERSION = 4.4.2;
 				DEVELOPMENT_TEAM = 4F446KW87E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
diff --git a/lexilla/src/Lexilla/Lexilla/Info.plist b/lexilla/src/Lexilla/Lexilla/Info.plist
index 9fa164497..6032125f0 100644
--- a/lexilla/src/Lexilla/Lexilla/Info.plist
+++ b/lexilla/src/Lexilla/Lexilla/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4.0</string>
+	<string>4.4.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/lexilla/src/LexillaVersion.rc b/lexilla/src/LexillaVersion.rc
index f7abb49a3..3ea30dd82 100644
--- a/lexilla/src/LexillaVersion.rc
+++ b/lexilla/src/LexillaVersion.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_LEXILLA "4.4.0"
-#define VERSION_WORDS 4, 4, 0, 0
+#define VERSION_LEXILLA "4.4.2"
+#define VERSION_WORDS 4, 4, 2, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff --git a/lexilla/version.txt b/lexilla/version.txt
index 534a21edd..18e1dd6bc 100644
--- a/lexilla/version.txt
+++ b/lexilla/version.txt
@@ -1 +1 @@
-440
+442
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index d24d3bbe1..7f9cb971b 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 4.4.0
+VERSION = 4.4.2
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index a26adf259..25c2b3ef5 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 4.4.0
+VERSION = 4.4.2
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 534a21edd..18e1dd6bc 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-440
+442
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 614b824f7..5b216d6f7 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "4.4.0"
-#define VERSION_WORDS 4, 4, 0, 0
+#define VERSION_SCINTILLA "4.4.2"
+#define VERSION_WORDS 4, 4, 2, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS