From 396d1cd7c3ffffc3df2339988dde8a55fd5e817d Mon Sep 17 00:00:00 2001 From: alek-d <25618925+alek-d@users.noreply.github.com> Date: Mon, 14 Sep 2020 19:30:53 +0200 Subject: [PATCH 1/7] Add static linking to Scintilla --- ports/scintilla/0001-static-build.patch | 46 +++++++++++++++++++++++++ ports/scintilla/portfile.cmake | 12 +++++-- 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 ports/scintilla/0001-static-build.patch diff --git a/ports/scintilla/0001-static-build.patch b/ports/scintilla/0001-static-build.patch new file mode 100644 index 00000000000000..be8c9267853497 --- /dev/null +++ b/ports/scintilla/0001-static-build.patch @@ -0,0 +1,46 @@ +diff --git a/win32/SciLexer.vcxproj b/win32/SciLexer.vcxproj +index b2e993c..c8774f1 100644 +--- a/win32/SciLexer.vcxproj ++++ b/win32/SciLexer.vcxproj +@@ -33,7 +33,7 @@ + + + +- DynamicLibrary ++ StaticLibrary + Unicode + v141 + +@@ -88,6 +88,7 @@ + + _DEBUG;%(PreprocessorDefinitions) + stdcpp17 ++ MultiThreadedDebug + + + Default +@@ -97,6 +98,7 @@ + + _DEBUG;%(PreprocessorDefinitions) + stdcpp17 ++ MultiThreadedDebug + + + Default +@@ -117,6 +119,7 @@ + true + NDEBUG;%(PreprocessorDefinitions) + stdcpp17 ++ MultiThreaded + + + true +@@ -129,6 +132,7 @@ + true + NDEBUG;%(PreprocessorDefinitions) + stdcpp17 ++ MultiThreaded + + + true +-- diff --git a/ports/scintilla/portfile.cmake b/ports/scintilla/portfile.cmake index 788896bdacff21..875a0458100a89 100644 --- a/ports/scintilla/portfile.cmake +++ b/ports/scintilla/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP") -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) - vcpkg_download_distfile(ARCHIVE URLS "http://www.scintilla.org/scintilla423.zip" FILENAME "scintilla423.zip" @@ -13,6 +11,14 @@ vcpkg_extract_source_archive_ex( REF 4.2.3 ) +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/0001-static-build.patch + ) +endif() + vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH Win32/SciLexer.vcxproj @@ -20,3 +26,5 @@ vcpkg_install_msbuild( LICENSE_SUBPATH License.txt ALLOW_ROOT_INCLUDES ) + +vcpkg_copy_pdbs() \ No newline at end of file From 7f25836a9cd6b1935e0fc4c2e4056530183b57ae Mon Sep 17 00:00:00 2001 From: alek-d <25618925+alek-d@users.noreply.github.com> Date: Mon, 14 Sep 2020 19:45:35 +0200 Subject: [PATCH 2/7] Add Port-Version to CONTROL --- ports/scintilla/CONTROL | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/scintilla/CONTROL b/ports/scintilla/CONTROL index 901697cc5beaf4..76065f659fbcc0 100644 --- a/ports/scintilla/CONTROL +++ b/ports/scintilla/CONTROL @@ -1,4 +1,5 @@ Source: scintilla Version: 4.2.3 +Port-Version: 1 Homepage: https://www.scintilla.org/ Description: A free source code editing component for Win32, GTK+, and OS X From 3a6eb149bb4ad86eb748ab4b2cf5c2bc8caaf508 Mon Sep 17 00:00:00 2001 From: alek-d <25618925+alek-d@users.noreply.github.com> Date: Tue, 15 Sep 2020 20:10:50 +0200 Subject: [PATCH 3/7] Split library linkage from crt linkage --- ports/scintilla/0001-static-lib.patch | 14 +++++++++++++ ...atic-build.patch => 0002-static-crt.patch} | 9 --------- ports/scintilla/portfile.cmake | 20 ++++++++++--------- 3 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 ports/scintilla/0001-static-lib.patch rename ports/scintilla/{0001-static-build.patch => 0002-static-crt.patch} (79%) diff --git a/ports/scintilla/0001-static-lib.patch b/ports/scintilla/0001-static-lib.patch new file mode 100644 index 00000000000000..2661b0f2d7dee2 --- /dev/null +++ b/ports/scintilla/0001-static-lib.patch @@ -0,0 +1,14 @@ +diff --git a/win32/SciLexer.vcxproj b/win32/SciLexer.vcxproj +index b2e993c..c8774f1 100644 +--- a/win32/SciLexer.vcxproj ++++ b/win32/SciLexer.vcxproj +@@ -33,7 +33,7 @@ + + + +- DynamicLibrary ++ StaticLibrary + Unicode + v141 + +-- diff --git a/ports/scintilla/0001-static-build.patch b/ports/scintilla/0002-static-crt.patch similarity index 79% rename from ports/scintilla/0001-static-build.patch rename to ports/scintilla/0002-static-crt.patch index be8c9267853497..20268d7d9b2fef 100644 --- a/ports/scintilla/0001-static-build.patch +++ b/ports/scintilla/0002-static-crt.patch @@ -2,15 +2,6 @@ diff --git a/win32/SciLexer.vcxproj b/win32/SciLexer.vcxproj index b2e993c..c8774f1 100644 --- a/win32/SciLexer.vcxproj +++ b/win32/SciLexer.vcxproj -@@ -33,7 +33,7 @@ - - - -- DynamicLibrary -+ StaticLibrary - Unicode - v141 - @@ -88,6 +88,7 @@ _DEBUG;%(PreprocessorDefinitions) diff --git a/ports/scintilla/portfile.cmake b/ports/scintilla/portfile.cmake index 875a0458100a89..c7e5a9bb4183ec 100644 --- a/ports/scintilla/portfile.cmake +++ b/ports/scintilla/portfile.cmake @@ -5,20 +5,22 @@ vcpkg_download_distfile(ARCHIVE FILENAME "scintilla423.zip" SHA512 82a595782119ce5bb48c39f4cb9b29605c4cdc276f605ebd3e3b3ecae003ef2132102e21be8943c8b36ec40957e2e50f4ebc0086a5096901fa0e8e5e178db750 ) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND PATCHES 0001-static-lib.patch) +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL "static") + list(APPEND PATCHES 0002-static-crt.patch) +endif() + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF 4.2.3 + PATCHES ${PATCHES} ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001-static-build.patch - ) -endif() - vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH Win32/SciLexer.vcxproj @@ -27,4 +29,4 @@ vcpkg_install_msbuild( ALLOW_ROOT_INCLUDES ) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() From 7706ddd6a641347c534411168a75cf701406c60f Mon Sep 17 00:00:00 2001 From: alek-d <25618925+alek-d@users.noreply.github.com> Date: Thu, 17 Sep 2020 15:19:15 +0200 Subject: [PATCH 4/7] Update CI baseline --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d9a84f18e568c0..a910cce4c0353a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1520,7 +1520,6 @@ scintilla:arm-uwp=fail scintilla:x64-linux=fail scintilla:x64-osx=fail scintilla:x64-uwp=fail -scintilla:x64-windows-static=fail sciter:arm64-windows=fail sciter:arm-uwp=fail sciter:x64-uwp=fail From eda848f381a0a6c7bc5b554fd7ffe7487a5eb7d4 Mon Sep 17 00:00:00 2001 From: alek-d <25618925+alek-d@users.noreply.github.com> Date: Fri, 18 Sep 2020 15:52:04 +0200 Subject: [PATCH 5/7] [scintilla] Update to 4.4.5 --- ports/scintilla/CONTROL | 3 +-- ports/scintilla/portfile.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ports/scintilla/CONTROL b/ports/scintilla/CONTROL index 76065f659fbcc0..731257f04f1697 100644 --- a/ports/scintilla/CONTROL +++ b/ports/scintilla/CONTROL @@ -1,5 +1,4 @@ Source: scintilla -Version: 4.2.3 -Port-Version: 1 +Version: 4.4.5 Homepage: https://www.scintilla.org/ Description: A free source code editing component for Win32, GTK+, and OS X diff --git a/ports/scintilla/portfile.cmake b/ports/scintilla/portfile.cmake index c7e5a9bb4183ec..ed6796b94f10d5 100644 --- a/ports/scintilla/portfile.cmake +++ b/ports/scintilla/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP") vcpkg_download_distfile(ARCHIVE - URLS "http://www.scintilla.org/scintilla423.zip" - FILENAME "scintilla423.zip" - SHA512 82a595782119ce5bb48c39f4cb9b29605c4cdc276f605ebd3e3b3ecae003ef2132102e21be8943c8b36ec40957e2e50f4ebc0086a5096901fa0e8e5e178db750 + URLS "https://www.scintilla.org/scintilla445.zip" + FILENAME "scintilla445.zip" + SHA512 bac25ee6e9b1ab3602a6fbf2f28f046f6da5c45dfd6e882df250760a254517ee9b05d95b816234b5145553f0a8da92016d7839a50624543c52fde7539ea08259 ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -17,7 +17,7 @@ endif() vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - REF 4.2.3 + REF 4.4.5 PATCHES ${PATCHES} ) From 136996f912c7e7decc98763194f163606eb9bc4f Mon Sep 17 00:00:00 2001 From: alek-d <25618925+alek-d@users.noreply.github.com> Date: Tue, 22 Sep 2020 21:49:15 +0200 Subject: [PATCH 6/7] Remove vcpkg_copy_pdbs() --- ports/scintilla/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/scintilla/portfile.cmake b/ports/scintilla/portfile.cmake index ed6796b94f10d5..8823621accfa61 100644 --- a/ports/scintilla/portfile.cmake +++ b/ports/scintilla/portfile.cmake @@ -28,5 +28,3 @@ vcpkg_install_msbuild( LICENSE_SUBPATH License.txt ALLOW_ROOT_INCLUDES ) - -vcpkg_copy_pdbs() From 649e3f20287556e037207311b3e7f82849907661 Mon Sep 17 00:00:00 2001 From: wangli28 Date: Thu, 24 Sep 2020 02:54:44 +0000 Subject: [PATCH 7/7] [scintilla] Add supports --- ports/scintilla/CONTROL | 1 + scripts/ci.baseline.txt | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/scintilla/CONTROL b/ports/scintilla/CONTROL index 731257f04f1697..290fb456a1cf1f 100644 --- a/ports/scintilla/CONTROL +++ b/ports/scintilla/CONTROL @@ -2,3 +2,4 @@ Source: scintilla Version: 4.4.5 Homepage: https://www.scintilla.org/ Description: A free source code editing component for Win32, GTK+, and OS X +Supports: !(uwp|linux|osx) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 114b12d468165b..102fba40e725fd 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1509,10 +1509,6 @@ ryu:x64-uwp=fail ryu:x64-windows-static=fail ryu:x86-windows=fail ryu::arm64-windows=fail -scintilla:arm-uwp=fail -scintilla:x64-linux=fail -scintilla:x64-osx=fail -scintilla:x64-uwp=fail sciter:arm64-windows=fail sciter:arm-uwp=fail sciter:x64-uwp=fail