From 053aa006940ffbc13f361ce082d0498441b7fd17 Mon Sep 17 00:00:00 2001 From: VuYeK Date: Sat, 18 Sep 2021 22:20:56 +0200 Subject: [PATCH 01/14] Added Sciter.JS port (version 4.4.8.10), deprecated Sciter port --- ports/sciter-js/portfile.cmake | 111 +++++++++++++++++++++++++++++++++ ports/sciter-js/vcpkg.json | 12 ++++ ports/sciter/portfile.cmake | 106 +------------------------------ ports/sciter/vcpkg.json | 14 ++--- versions/baseline.json | 8 ++- versions/s-/sciter-js.json | 9 +++ versions/s-/sciter.json | 5 ++ 7 files changed, 150 insertions(+), 115 deletions(-) create mode 100644 ports/sciter-js/portfile.cmake create mode 100644 ports/sciter-js/vcpkg.json create mode 100644 versions/s-/sciter-js.json diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake new file mode 100644 index 00000000000000..604d913db12be3 --- /dev/null +++ b/ports/sciter-js/portfile.cmake @@ -0,0 +1,111 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "Sciter only supports Windows Desktop") +endif() + +set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) + +set(SCITER_REVISION ffa3a73e17c0921d570fc227e20115ed656826d0) +set(SCITER_SHA 32d9bc17cd386e1e59a0cd86178b1e4782cb65d353207fa8d53ecafda98e242697796d5ea059d1fb426e7e473ba19e71383953c2c28350cf7772e64da70a6d06) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + set(SCITER_ARCH x64) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(SCITER_ARCH x32) +else() + message(FATAL_ERROR "Sciter only supports x86/x64") +endif() + +# check out the `https://github.com/c-smile/sciter-js-sdk/archive/${SCITER_REVISION}.tar.gz` +# hash checksum can be obtained with `curl -L -o tmp.tgz ${URL} && vcpkg hash tmp.tgz` +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO c-smile/sciter-js-sdk + REF ${SCITER_REVISION} + SHA512 ${SCITER_SHA} +) + +# install include directory +file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/sciter-js + FILES_MATCHING + PATTERN "*.cpp" + PATTERN "*.mm" + PATTERN "*.h" + PATTERN "*.hpp" +) + +set(SCITER_SHARE "${CURRENT_PACKAGES_DIR}/share/sciter-js") +set(SCITER_TOOLS ${CURRENT_PACKAGES_DIR}/tools/sciter-js) +set(TOOL_PERMS FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + +# license +file(COPY ${SOURCE_PATH}/logfile.md DESTINATION ${SCITER_SHARE}) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${SCITER_SHARE} RENAME copyright) + +# tools +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Linux AND VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + set(SCITER_BIN ${SOURCE_PATH}/bin/linux/x64) + + file(INSTALL ${SOURCE_PATH}/bin/linux/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SOURCE_PATH}/bin/linux/qjs DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SOURCE_PATH}/bin/linux/qjsc DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + + file(INSTALL ${SCITER_BIN}/usciter DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/inspector DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/sciter-sqlite.so DESTINATION ${SCITER_TOOLS}) + + if ("windowless" IN_LIST FEATURES) + set(SCITER_BIN ${SOURCE_PATH}/bin.lite/linux/x64) + 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) + + file(INSTALL ${SCITER_BIN}/sciter-sqlite.so DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/sciter-sqlite.so DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) + set(SCITER_BIN ${SOURCE_PATH}/bin/macosx) + + file(INSTALL ${SCITER_BIN}/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/qjs DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/qjsc DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + + file(INSTALL ${SCITER_BIN}/inspector.app DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/usciterjs.app DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${SCITER_TOOLS}) + + execute_process(COMMAND sh -c "chmod +x usciterjs.app/Contents/MacOS/usciterjs" WORKING_DIRECTORY ${SCITER_TOOLS}) + execute_process(COMMAND sh -c "chmod +x inspector.app/Contents/MacOS/inspector" WORKING_DIRECTORY ${SCITER_TOOLS}) + + file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + +else() + set(SCITER_BIN ${SOURCE_PATH}/bin/windows/${SCITER_ARCH}) + set(SCITER_BIN32 ${SOURCE_PATH}/bin/windows/x32) + + file(INSTALL ${SOURCE_PATH}/bin/windows/packfolder.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SOURCE_PATH}/bin/windows/qjs.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SOURCE_PATH}/bin/windows/qjsc.exe DESTINATION ${SCITER_TOOLS}) + + file(INSTALL ${SCITER_BIN}/scapp.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/usciter.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/inspector.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${SCITER_TOOLS}) + + if ("windowless" IN_LIST FEATURES) + set(SCITER_BIN ${SOURCE_PATH}/bin.lite/windows/${SCITER_ARCH}) + endif() + + file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + + file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + + message(WARNING "Sciter requires manual deployment of the correct DLL files.") +endif() diff --git a/ports/sciter-js/vcpkg.json b/ports/sciter-js/vcpkg.json new file mode 100644 index 00000000000000..9e85b35bd5d9d0 --- /dev/null +++ b/ports/sciter-js/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "sciter-js", + "version-string": "4.4.8.10", + "description": "Sciter.JS - Sciter but with QuickJS on board instead of TIScript. Sciter is an embeddable HTML/CSS/scripting engine.", + "homepage": "https://github.com/c-smile/sciter-js-sdk", + "supports": "!uwp & !arm & !static", + "features": { + "windowless": { + "description": "windowless version - lite version" + } + } +} diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake index eab17e4e65cf64..ea87139a5df507 100644 --- a/ports/sciter/portfile.cmake +++ b/ports/sciter/portfile.cmake @@ -1,105 +1,3 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "Sciter only supports Windows Desktop") -endif() - -# header-only library -set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) - -set(SCITER_REVISION 29a598b6d20220b93848b5e8abab704619296857) -set(SCITER_SHA dc9ebcc59a4ca7b154efcbd96c7e0aa53dc344f6a2cfa91f8c351c1edc5a0f060129715f8eac85e00df9b6c153322a9ba36b430da5020d38769740434cbcd52c) - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - set(SCITER_ARCH x64) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - set(SCITER_ARCH x32) -endif() - -# check out the `https://github.com/c-smile/sciter-sdk/archive/${SCITER_REVISION}.tar.gz` -# hash checksum can be obtained with `curl -L -o tmp.tgz ${URL} && vcpkg hash tmp.tgz` -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO c-smile/sciter-sdk - REF ${SCITER_REVISION} - SHA512 ${SCITER_SHA} -) - -# install include directory -file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/sciter - FILES_MATCHING - PATTERN "*.cpp" - PATTERN "*.mm" - PATTERN "*.h" - PATTERN "*.hpp" -) - -set(SCITER_SHARE ${CURRENT_PACKAGES_DIR}/share/sciter) -set(SCITER_TOOLS ${CURRENT_PACKAGES_DIR}/tools/sciter) -set(TOOL_PERMS FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - -# license -file(COPY ${SOURCE_PATH}/logfile.htm DESTINATION ${SCITER_SHARE}) -file(INSTALL ${SOURCE_PATH}/license.htm DESTINATION ${SCITER_SHARE} RENAME copyright) - -# samples & widgets -file(COPY ${SOURCE_PATH}/samples DESTINATION ${SCITER_SHARE}) -file(COPY ${SOURCE_PATH}/widgets DESTINATION ${SCITER_SHARE}) - -# tools -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Linux AND VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - set(SCITER_BIN ${SOURCE_PATH}/bin.lnx/x64) - - file(INSTALL ${SOURCE_PATH}/bin.lnx/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) - file(INSTALL ${SOURCE_PATH}/bin.lnx/tiscript DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) - - file(INSTALL ${SCITER_BIN}/usciter DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) - 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) - -elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) - set(SCITER_BIN ${SOURCE_PATH}/bin.osx) - - file(INSTALL ${SCITER_BIN}/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) - file(INSTALL ${SCITER_BIN}/tiscript DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) - - file(INSTALL ${SCITER_BIN}/inspector.app DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN}/sciter.app DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${SCITER_TOOLS}) - - # not sure whether there is a better way to do this, because - # `file(INSTALL sciter.app FILE_PERMISSIONS EXECUTE)` - # would mark everything as executable which is no go. - execute_process(COMMAND sh -c "chmod +x sciter.app/Contents/MacOS/sciter" WORKING_DIRECTORY ${SCITER_TOOLS}) - execute_process(COMMAND sh -c "chmod +x inspector.app/Contents/MacOS/inspector" WORKING_DIRECTORY ${SCITER_TOOLS}) - - file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - -else() - set(SCITER_BIN ${SOURCE_PATH}/bin.win/${SCITER_ARCH}) - set(SCITER_BIN32 ${SOURCE_PATH}/bin.win/x32) - - file(INSTALL ${SOURCE_PATH}/bin.win/packfolder.exe DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SOURCE_PATH}/bin.win/tiscript.exe DESTINATION ${SCITER_TOOLS}) - - file(INSTALL ${SCITER_BIN32}/wsciter.exe DESTINATION ${SCITER_TOOLS}) - 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() - -message(STATUS "Warning: Sciter requires manual deployment of the correct DLL files.") +message(WARNING "The sciter port is deprecated, using sciter-js instead") diff --git a/ports/sciter/vcpkg.json b/ports/sciter/vcpkg.json index de007100f69427..8eee6f17cd7cac 100644 --- a/ports/sciter/vcpkg.json +++ b/ports/sciter/vcpkg.json @@ -1,13 +1,9 @@ { "name": "sciter", - "version-string": "4.4.8.3", - "port-version": 1, + "version-string": "deprecated", "description": "Sciter is an embeddable HTML/CSS/scripting engine.", - "homepage": "https://github.com/c-smile/sciter-sdk", - "supports": "!uwp", - "features": { - "windowless": { - "description": "Uses Sciter.Lite builds" - } - } + "homepage": "https://github.com/c-smile/sciter-js-sdk", + "dependencies": [ + "sciter-js" + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 0c3cce9c26ace3..d60ff225c072d3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5881,8 +5881,12 @@ "port-version": 0 }, "sciter": { - "baseline": "4.4.8.3", - "port-version": 1 + "baseline": "deprecated", + "port-version": 0 + }, + "sciter-js": { + "baseline": "4.4.8.10", + "port-version": 0 }, "scnlib": { "baseline": "0.4", diff --git a/versions/s-/sciter-js.json b/versions/s-/sciter-js.json new file mode 100644 index 00000000000000..034a39cc3ed613 --- /dev/null +++ b/versions/s-/sciter-js.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fb6857b026c453ce34d1d0bdd1e97be8dcb564cc", + "version-string": "4.4.8.10", + "port-version": 0 + } + ] +} diff --git a/versions/s-/sciter.json b/versions/s-/sciter.json index 4f00a7e85093d7..11787b314a1232 100644 --- a/versions/s-/sciter.json +++ b/versions/s-/sciter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "450fb94588bfe7a7927c46cbdda5755d8868504d", + "version-string": "deprecated", + "port-version": 0 + }, { "git-tree": "7508c766a2564096e3ca656f6b4a26d582dcf855", "version-string": "4.4.8.3", From 8b1a7fb75ce5aabc6a1426e85a338ae73080dd9b Mon Sep 17 00:00:00 2001 From: VuYeK Date: Thu, 23 Sep 2021 11:50:45 +0200 Subject: [PATCH 02/14] Update ports/sciter-js/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- ports/sciter-js/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake index 604d913db12be3..5fd2445eeaec85 100644 --- a/ports/sciter-js/portfile.cmake +++ b/ports/sciter-js/portfile.cmake @@ -1,6 +1,6 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_UWP) message(FATAL_ERROR "Sciter only supports Windows Desktop") endif() From 1e0a5f1655759b764943fd31fbe550f3562b049b Mon Sep 17 00:00:00 2001 From: VuYeK Date: Thu, 23 Sep 2021 12:47:01 +0200 Subject: [PATCH 03/14] Update ports/sciter-js/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- ports/sciter-js/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake index 5fd2445eeaec85..3aa4248f55fbda 100644 --- a/ports/sciter-js/portfile.cmake +++ b/ports/sciter-js/portfile.cmake @@ -44,7 +44,7 @@ file(COPY ${SOURCE_PATH}/logfile.md DESTINATION ${SCITER_SHARE}) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${SCITER_SHARE} RENAME copyright) # tools -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Linux AND VCPKG_TARGET_ARCHITECTURE STREQUAL x64) +if(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(SCITER_BIN ${SOURCE_PATH}/bin/linux/x64) file(INSTALL ${SOURCE_PATH}/bin/linux/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) From ce688b41e1f173a8edb78bb571d1806ace917c43 Mon Sep 17 00:00:00 2001 From: VuYeK Date: Thu, 23 Sep 2021 12:47:11 +0200 Subject: [PATCH 04/14] Update ports/sciter-js/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- ports/sciter-js/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake index 3aa4248f55fbda..9c32e31a880f0d 100644 --- a/ports/sciter-js/portfile.cmake +++ b/ports/sciter-js/portfile.cmake @@ -66,7 +66,7 @@ if(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") file(INSTALL ${SCITER_BIN}/sciter-sqlite.so DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(INSTALL ${SCITER_BIN}/sciter-sqlite.so DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) -elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) +elseif(VCPKG_TARGET_IS_OSX) set(SCITER_BIN ${SOURCE_PATH}/bin/macosx) file(INSTALL ${SCITER_BIN}/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) From 00b57ceb43b09cd5413c60b72006d9965c6216be Mon Sep 17 00:00:00 2001 From: VuYeK Date: Thu, 23 Sep 2021 12:47:20 +0200 Subject: [PATCH 05/14] Update ports/sciter-js/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- ports/sciter-js/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake index 9c32e31a880f0d..d0e4858a54215f 100644 --- a/ports/sciter-js/portfile.cmake +++ b/ports/sciter-js/portfile.cmake @@ -83,7 +83,7 @@ elseif(VCPKG_TARGET_IS_OSX) file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) -else() +elseif(VCPKG_TARGET_IS_WINDOWS) set(SCITER_BIN ${SOURCE_PATH}/bin/windows/${SCITER_ARCH}) set(SCITER_BIN32 ${SOURCE_PATH}/bin/windows/x32) From 8ed1e09a3a2e904358a75b8ea0718ba99aa16c48 Mon Sep 17 00:00:00 2001 From: VuYeK Date: Thu, 23 Sep 2021 12:53:32 +0200 Subject: [PATCH 06/14] Added Sciter.JS port (version 4.4.8.10), deprecated Sciter port --- versions/s-/sciter-js.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/sciter-js.json b/versions/s-/sciter-js.json index 034a39cc3ed613..7be4fcea5cd85e 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fb6857b026c453ce34d1d0bdd1e97be8dcb564cc", + "git-tree": "2b5e1d9429f49ca16de4311e93ce428765d2cc9b", "version-string": "4.4.8.10", "port-version": 0 } From dc591e9be3582711c95fc48c0ee2b43115155d69 Mon Sep 17 00:00:00 2001 From: VuYeK Date: Thu, 11 Nov 2021 02:18:25 +0100 Subject: [PATCH 07/14] Added Sciter.JS port (version 4.4.8.16) --- ports/sciter-js/portfile.cmake | 4 ++-- ports/sciter-js/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sciter-js.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake index d0e4858a54215f..b9f438d5b97211 100644 --- a/ports/sciter-js/portfile.cmake +++ b/ports/sciter-js/portfile.cmake @@ -6,8 +6,8 @@ endif() set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -set(SCITER_REVISION ffa3a73e17c0921d570fc227e20115ed656826d0) -set(SCITER_SHA 32d9bc17cd386e1e59a0cd86178b1e4782cb65d353207fa8d53ecafda98e242697796d5ea059d1fb426e7e473ba19e71383953c2c28350cf7772e64da70a6d06) +set(SCITER_REVISION d5a13ff197fed3af46d4bc931c158828eb61e357) +set(SCITER_SHA 5be2db9d2e5caa19be158020a084a246acd6dad2047062f603b3af4f3cdbdd7f7750b263ad6dfaa6c3667de6c51084fc2df75cd3cb8cd60501550377dded1928) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(SCITER_ARCH x64) diff --git a/ports/sciter-js/vcpkg.json b/ports/sciter-js/vcpkg.json index 9e85b35bd5d9d0..46e0121088d952 100644 --- a/ports/sciter-js/vcpkg.json +++ b/ports/sciter-js/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sciter-js", - "version-string": "4.4.8.10", + "version-string": "4.4.8.16", "description": "Sciter.JS - Sciter but with QuickJS on board instead of TIScript. Sciter is an embeddable HTML/CSS/scripting engine.", "homepage": "https://github.com/c-smile/sciter-js-sdk", "supports": "!uwp & !arm & !static", diff --git a/versions/baseline.json b/versions/baseline.json index ab8696699cb23e..8bc5ec16e5761f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5885,7 +5885,7 @@ "port-version": 0 }, "sciter-js": { - "baseline": "4.4.8.10", + "baseline": "4.4.8.16", "port-version": 0 }, "scnlib": { diff --git a/versions/s-/sciter-js.json b/versions/s-/sciter-js.json index 7be4fcea5cd85e..7f0cd51fd30dce 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "2b5e1d9429f49ca16de4311e93ce428765d2cc9b", - "version-string": "4.4.8.10", + "git-tree": "d8b949852b38b18eac5c4fa0c25282d531c596fd", + "version-string": "4.4.8.16", "port-version": 0 } ] From cd53fde1396629e9233b6de4159b4565561c53af Mon Sep 17 00:00:00 2001 From: VuYeK Date: Fri, 12 Nov 2021 12:59:53 +0100 Subject: [PATCH 08/14] Update ports/sciter/portfile.cmake Co-authored-by: Robert Schumacher --- ports/sciter/portfile.cmake | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake index ea87139a5df507..8c8fe9f83956b1 100644 --- a/ports/sciter/portfile.cmake +++ b/ports/sciter/portfile.cmake @@ -1,3 +1,12 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -message(WARNING "The sciter port is deprecated, using sciter-js instead") +message(FATAL_ERROR "The sciter port is deprecated by upstream and conflicts with upstream's replacement. + +Upstream has stopped active development of sciter and instead encourage users to move to a new library Sciter.JS that uses javascript as the internal scripting language (sciter-js in vcpkg). + +Options for existing users are: +1. Depend upon `sciter-js` and change your code to work with the new library +2. Use `"overrides"` in manifest mode to pin to `"version-string": "4.4.8.3#1"` +3. Copy the last available `sciter` version into an overlay port (commit 756f1845537a916ba706f6af544b2f490c30fbb1 at subpath `ports/sciter`) +4. Use the community registry `https://github.com/VuYeK/vcpkg-registry` which may have newer versions of `sciter` available (not affiliated with Microsoft) +") From cd7dbc5071f55f5d24e549758706d40e0aafeb59 Mon Sep 17 00:00:00 2001 From: VuYeK Date: Fri, 12 Nov 2021 13:01:31 +0100 Subject: [PATCH 09/14] Update ports/sciter/vcpkg.json Co-authored-by: Robert Schumacher --- ports/sciter/vcpkg.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/ports/sciter/vcpkg.json b/ports/sciter/vcpkg.json index 8eee6f17cd7cac..5f777c2e375148 100644 --- a/ports/sciter/vcpkg.json +++ b/ports/sciter/vcpkg.json @@ -3,7 +3,4 @@ "version-string": "deprecated", "description": "Sciter is an embeddable HTML/CSS/scripting engine.", "homepage": "https://github.com/c-smile/sciter-js-sdk", - "dependencies": [ - "sciter-js" - ] } From 55068fd19276b4418dfb4c631b76ce857f439fab Mon Sep 17 00:00:00 2001 From: VuYeK Date: Fri, 12 Nov 2021 13:07:40 +0100 Subject: [PATCH 10/14] Removed trailing comma --- ports/sciter/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sciter/vcpkg.json b/ports/sciter/vcpkg.json index 5f777c2e375148..6376eb352ed415 100644 --- a/ports/sciter/vcpkg.json +++ b/ports/sciter/vcpkg.json @@ -2,5 +2,5 @@ "name": "sciter", "version-string": "deprecated", "description": "Sciter is an embeddable HTML/CSS/scripting engine.", - "homepage": "https://github.com/c-smile/sciter-js-sdk", + "homepage": "https://github.com/c-smile/sciter-js-sdk" } From e6af976d9da3a435666b3bdd2a6e132ad3d5f66e Mon Sep 17 00:00:00 2001 From: VuYeK Date: Fri, 12 Nov 2021 13:09:54 +0100 Subject: [PATCH 11/14] SHA update --- versions/s-/sciter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/sciter.json b/versions/s-/sciter.json index 11787b314a1232..c455a59f42f2c7 100644 --- a/versions/s-/sciter.json +++ b/versions/s-/sciter.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "450fb94588bfe7a7927c46cbdda5755d8868504d", + "git-tree": "942b0c505b2dd4317db0eb419416110c9db024be", "version-string": "deprecated", "port-version": 0 }, From 344413b618ef1d36f16cc2b733a52ecc92aec6a2 Mon Sep 17 00:00:00 2001 From: VuYeK Date: Fri, 12 Nov 2021 13:16:35 +0100 Subject: [PATCH 12/14] Updated ci.baseline --- scripts/ci.baseline.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9793facf03aa55..f60dac22cee9d8 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1379,8 +1379,13 @@ ryu:x86-windows=fail ryu::arm64-windows=fail sciter:arm64-windows=fail sciter:arm-uwp=fail +sciter:x64-linux=fail +sciter:x64-osx=fail sciter:x64-uwp=fail +sciter:x64-windows=fail sciter:x64-windows-static=fail +sciter:x64-windows-static-md=fail +sciter:x86-windows=fail scnlib:arm-uwp=fail scnlib:x64-uwp=fail scylla-wrapper:arm-uwp=fail From ebebc86c397b7b38d6ae89003c343ed72fe45071 Mon Sep 17 00:00:00 2001 From: VuYeK Date: Fri, 12 Nov 2021 17:04:26 +0100 Subject: [PATCH 13/14] Updated sciter homepage --- ports/sciter/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sciter/vcpkg.json b/ports/sciter/vcpkg.json index 6376eb352ed415..f0af85560ce818 100644 --- a/ports/sciter/vcpkg.json +++ b/ports/sciter/vcpkg.json @@ -2,5 +2,5 @@ "name": "sciter", "version-string": "deprecated", "description": "Sciter is an embeddable HTML/CSS/scripting engine.", - "homepage": "https://github.com/c-smile/sciter-js-sdk" + "homepage": "https://github.com/c-smile/sciter-sdk" } From 55d7e844f15fa129dd120589d36bd48b64282518 Mon Sep 17 00:00:00 2001 From: VuYeK Date: Fri, 12 Nov 2021 17:08:43 +0100 Subject: [PATCH 14/14] Updated sciter SHA --- versions/s-/sciter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/sciter.json b/versions/s-/sciter.json index c455a59f42f2c7..2acb342cc50b27 100644 --- a/versions/s-/sciter.json +++ b/versions/s-/sciter.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "942b0c505b2dd4317db0eb419416110c9db024be", + "git-tree": "1ff6683a2d398db76e1791b994dc157ffb21e88c", "version-string": "deprecated", "port-version": 0 },