From 894baabf5c0f279d27992a05ae7eeecbe489b8eb Mon Sep 17 00:00:00 2001 From: pravic Date: Thu, 11 Jun 2020 11:58:31 +0300 Subject: [PATCH] [sciter] Update to 4.4.3.20.7852 (#11723) * [sciter] Update to 4.4.3.20.7852 * [sciter] A feature to install windowless variants of the library. * Update ports/sciter/CONTROL Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/sciter/CONTROL | 5 ++++- ports/sciter/portfile.cmake | 15 +++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ports/sciter/CONTROL b/ports/sciter/CONTROL index aca05779ee..5b0b7439da 100644 --- a/ports/sciter/CONTROL +++ b/ports/sciter/CONTROL @@ -1,5 +1,8 @@ Source: sciter -Version: 4.4.3.18 +Version: 4.4.3.20 Homepage: https://github.com/c-smile/sciter-sdk Description: Sciter is an embeddable HTML/CSS/scripting engine. Supports: !uwp + +Feature: windowless +Description: Uses Sciter.Lite builds diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake index 2477bd2def..4c9d7f6d30 100644 --- a/ports/sciter/portfile.cmake +++ b/ports/sciter/portfile.cmake @@ -9,8 +9,8 @@ endif() # header-only library set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -set(SCITER_REVISION f8485d9333d16fb0ce2142ebced106a84a87d62b) -set(SCITER_SHA 014c5167dd02fe402cb216f96b35d194c57efcd46557f944542e3ca3a9cac31c77b7bc4c91e5d727b27ba920fe6070dc7a916752f07e0a957826074ade08bc44) +set(SCITER_REVISION 63c9328e88c1877deea721cbe060b19c4fce7cb6) +set(SCITER_SHA 151ae3f74980e76fa04e0d5ef54ed56efcee312b4654c906a04b017384073ddf9ae353c29d9f0a12f681fd83d42e57b9ed3b563c641979406ddad0b3cc26d49c) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(SCITER_ARCH x64) @@ -42,8 +42,7 @@ set(TOOL_PERMS FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ # license file(COPY ${SOURCE_PATH}/logfile.htm DESTINATION ${SCITER_SHARE}) -file(COPY ${SOURCE_PATH}/license.htm DESTINATION ${SCITER_SHARE}) -file(RENAME ${SCITER_SHARE}/license.htm ${SCITER_SHARE}/copyright) +file(INSTALL ${SOURCE_PATH}/license.htm DESTINATION ${SCITER_SHARE} RENAME copyright) # samples & widgets file(COPY ${SOURCE_PATH}/samples DESTINATION ${SCITER_SHARE}) @@ -60,6 +59,10 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Linux AND VCPKG_TARGET_ARCHITECTURE STREQUAL file(INSTALL ${SCITER_BIN}/inspector DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${SCITER_TOOLS}) + if ("windowless" IN_LIST FEATURES) + set(SCITER_BIN ${SOURCE_PATH}/bin.lnx/x64lite) + endif() + file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) @@ -93,6 +96,10 @@ else() file(INSTALL ${SCITER_BIN32}/inspector.exe DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN32}/sciter.dll DESTINATION ${SCITER_TOOLS}) + if ("windowless" IN_LIST FEATURES) + set(SCITER_BIN ${SOURCE_PATH}/bin.win/${SCITER_ARCH}lite) + endif() + file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) endif()