From 93c2b3f0d82294317e052471c813f042f0ba8abe Mon Sep 17 00:00:00 2001 From: VuYeK Date: Wed, 2 Mar 2022 21:24:29 +0100 Subject: [PATCH 01/11] Updated sciter-js to 4.4.8.31 --- ports/sciter-js/portfile.cmake | 4 ++-- ports/sciter-js/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sciter-js.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake index b9f438d5b97211..66af6bb0e42428 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 d5a13ff197fed3af46d4bc931c158828eb61e357) -set(SCITER_SHA 5be2db9d2e5caa19be158020a084a246acd6dad2047062f603b3af4f3cdbdd7f7750b263ad6dfaa6c3667de6c51084fc2df75cd3cb8cd60501550377dded1928) +set(SCITER_REVISION 52bfe183983118c884294c864ee7b3d0dd199de6) +set(SCITER_SHA d31ef2a07525bf1c91b9f36ee434db6227bead732f5779cb4ee28ab6d92957bfb3d4656a960d3c47e64f3efc207f78be64853a56b1e1a14f56fd3c829b022155) 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 46e0121088d952..f42626b7d54fc6 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.16", + "version-string": "4.4.8.31", "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 92a076b2318101..fa822a802e9c5c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6261,7 +6261,7 @@ "port-version": 0 }, "sciter-js": { - "baseline": "4.4.8.16", + "baseline": "4.4.8.31", "port-version": 0 }, "scnlib": { diff --git a/versions/s-/sciter-js.json b/versions/s-/sciter-js.json index 7f0cd51fd30dce..0813d7fbc89871 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00626f80fca661c7b574c0d49013d30ec515a3ef", + "version-string": "4.4.8.31", + "port-version": 0 + }, { "git-tree": "d8b949852b38b18eac5c4fa0c25282d531c596fd", "version-string": "4.4.8.16", From 604b7064bf9634c076ea72e94ae2bdf1995a524b Mon Sep 17 00:00:00 2001 From: VuYeK Date: Wed, 2 Mar 2022 22:09:54 +0100 Subject: [PATCH 02/11] Updated sciter-js to 4.4.8.31 --- ports/sciter-js/portfile.cmake | 2 +- versions/s-/sciter-js.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake index 66af6bb0e42428..85baf87a81a8fa 100644 --- a/ports/sciter-js/portfile.cmake +++ b/ports/sciter-js/portfile.cmake @@ -94,8 +94,8 @@ elseif(VCPKG_TARGET_IS_WINDOWS) 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}/window-mixin.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}) diff --git a/versions/s-/sciter-js.json b/versions/s-/sciter-js.json index 0813d7fbc89871..6b3d546743210a 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "00626f80fca661c7b574c0d49013d30ec515a3ef", + "git-tree": "43ce24ae85f3b996e731d9e159c674f705409ac4", "version-string": "4.4.8.31", "port-version": 0 }, From 1a87037a32b229dcf284022c6fa81acfb3be9aaf Mon Sep 17 00:00:00 2001 From: VuYeK Date: Wed, 2 Mar 2022 22:15:52 +0100 Subject: [PATCH 03/11] Updated sciter-js to 4.4.8.31 --- ports/sciter-js/portfile.cmake | 3 --- versions/s-/sciter-js.json | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake index 85baf87a81a8fa..74dece7949613d 100644 --- a/ports/sciter-js/portfile.cmake +++ b/ports/sciter-js/portfile.cmake @@ -104,8 +104,5 @@ elseif(VCPKG_TARGET_IS_WINDOWS) 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/versions/s-/sciter-js.json b/versions/s-/sciter-js.json index 6b3d546743210a..e3805cd6254671 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "43ce24ae85f3b996e731d9e159c674f705409ac4", + "git-tree": "c1ab21374bbcd674911ff5093e8ce859334f7352", "version-string": "4.4.8.31", "port-version": 0 }, From 2ad4087ef5b796a6ca80c544dd917f9f60103680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 11 Mar 2022 15:26:00 +0800 Subject: [PATCH 04/11] Update ports/sciter-js/vcpkg.json --- ports/sciter-js/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sciter-js/vcpkg.json b/ports/sciter-js/vcpkg.json index f42626b7d54fc6..6e5606aabf93f0 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.31", + "version": "4.4.8.31", "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", From a0cb4bc6b8c8c6b743edc1916d048088839baa76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 11 Mar 2022 15:30:38 +0800 Subject: [PATCH 05/11] Update versions/s-/sciter-js.json --- versions/s-/sciter-js.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/versions/s-/sciter-js.json b/versions/s-/sciter-js.json index e3805cd6254671..c162ad7b29cf37 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -2,7 +2,8 @@ "versions": [ { "git-tree": "c1ab21374bbcd674911ff5093e8ce859334f7352", - "version-string": "4.4.8.31", + "version": "4.4.8.31", + "port-version": 0 }, { From 95cd20b6b1732413de900bb7971dc7e8dc22905b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 11 Mar 2022 15:31:18 +0800 Subject: [PATCH 06/11] Update versions/s-/sciter-js.json --- versions/s-/sciter-js.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/versions/s-/sciter-js.json b/versions/s-/sciter-js.json index c162ad7b29cf37..126633540952c2 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -1,7 +1,8 @@ { "versions": [ { - "git-tree": "c1ab21374bbcd674911ff5093e8ce859334f7352", + "git-tree": "708c5345421be4b92ea288a7447a4c228fc98413", + "version": "4.4.8.31", "port-version": 0 From 8d4b3e699197896c7047fef7c4b8725d400f0b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 11 Mar 2022 15:42:01 +0800 Subject: [PATCH 07/11] Update versions/s-/sciter-js.json --- versions/s-/sciter-js.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/versions/s-/sciter-js.json b/versions/s-/sciter-js.json index 126633540952c2..de1c7ff67815d4 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -2,9 +2,7 @@ "versions": [ { "git-tree": "708c5345421be4b92ea288a7447a4c228fc98413", - "version": "4.4.8.31", - "port-version": 0 }, { From 03ca6b5a5bf26341c41eb24025be93133de1840d Mon Sep 17 00:00:00 2001 From: FrankXie Date: Thu, 10 Mar 2022 23:58:53 -0800 Subject: [PATCH 08/11] string --- ports/sciter-js/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sciter-js/vcpkg.json b/ports/sciter-js/vcpkg.json index 6e5606aabf93f0..f42626b7d54fc6 100644 --- a/ports/sciter-js/vcpkg.json +++ b/ports/sciter-js/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sciter-js", - "version": "4.4.8.31", + "version-string": "4.4.8.31", "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", From 1c9ba83b46167502204246dbf0e65853eb5472b2 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Fri, 11 Mar 2022 00:03:00 -0800 Subject: [PATCH 09/11] update version --- ports/sciter-js/vcpkg.json | 2 +- versions/s-/sciter-js.json | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ports/sciter-js/vcpkg.json b/ports/sciter-js/vcpkg.json index f42626b7d54fc6..6e5606aabf93f0 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.31", + "version": "4.4.8.31", "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/s-/sciter-js.json b/versions/s-/sciter-js.json index de1c7ff67815d4..9d78156424f23f 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -1,14 +1,14 @@ -{ - "versions": [ - { - "git-tree": "708c5345421be4b92ea288a7447a4c228fc98413", - "version": "4.4.8.31", - "port-version": 0 - }, - { - "git-tree": "d8b949852b38b18eac5c4fa0c25282d531c596fd", - "version-string": "4.4.8.16", - "port-version": 0 - } - ] -} +{ + "versions": [ + { + "git-tree": "c1ab21374bbcd674911ff5093e8ce859334f7352", + "version": "4.4.8.31", + "port-version": 0 + }, + { + "git-tree": "d8b949852b38b18eac5c4fa0c25282d531c596fd", + "version-string": "4.4.8.16", + "port-version": 0 + } + ] +} From c26ec09cd3233223ccb80abc72bdca3de6cc4df6 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Fri, 11 Mar 2022 00:21:44 -0800 Subject: [PATCH 10/11] version --- ports/sciter-js/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake index 74dece7949613d..82759029ea3264 100644 --- a/ports/sciter-js/portfile.cmake +++ b/ports/sciter-js/portfile.cmake @@ -105,4 +105,5 @@ elseif(VCPKG_TARGET_IS_WINDOWS) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) message(WARNING "Sciter requires manual deployment of the correct DLL files.") + endif() From ea902f1abdb735a758bfd2f7fb1ddbfb6ea568ec Mon Sep 17 00:00:00 2001 From: FrankXie Date: Fri, 11 Mar 2022 00:23:34 -0800 Subject: [PATCH 11/11] update version --- 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 9d78156424f23f..c8c3f635249f89 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c1ab21374bbcd674911ff5093e8ce859334f7352", + "git-tree": "01c76a267b6924a5f1f03349738e479e8bbe2c0b", "version": "4.4.8.31", "port-version": 0 },