From df7808a84f696a7630711031c9a5719a9afd7248 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 22 Apr 2022 21:19:31 +0300 Subject: [PATCH 001/266] Jenkinsfile, pip --- Jenkinsfile | 27 --------------------------- pip | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d14f2cd..03dc538 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,30 +49,3 @@ node { archiveArtifacts 'release/*' echo "${_msg}" } -pipeline { - agent { - label 'master' - } - options { - copyArtifactPermission('*'); - buildDiscarder(logRotator(numToKeepStr: "20", artifactNumToKeepStr: "10")) - } - stages { - stage("PIP doc") { - steps { - checkout scm - sh "rm -rf share" - sh "rm -vf *.zip" - sh "mkdir -p build" - sh "cd build && cmake -DLOCAL=1 -DCMAKE_INSTALL_PREFIX=`pwd` -DDOC_LANG=English -DDOC_DIR=en ../ && make doc" - sh "cd build && cmake -DLOCAL=1 -DCMAKE_INSTALL_PREFIX=`pwd` -DDOC_LANG=Russian -DDOC_DIR=ru ../ && make doc" - sh "cd share/doc && zip -r ../../pip_doc.zip pip" - sh "cp share/doc/pip/html/en/pip_en.qch ./" - sh "cp share/doc/pip/html/ru/pip_ru.qch ./" - archiveArtifacts 'pip_doc.zip' - archiveArtifacts 'pip_en.qch' - archiveArtifacts 'pip_ru.qch' - } - } - } -} diff --git a/pip b/pip index 831f202..39e4d9a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 831f2025368b200076d68d6611b790340ad31a98 +Subproject commit 39e4d9a73c42f98065a5677d4278e429561b458b From 178f7ad40ec6bb9485bc12f017e7e1d9bb9a9f29 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 22 Apr 2022 21:53:05 +0300 Subject: [PATCH 002/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 39e4d9a..e67a426 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 39e4d9a73c42f98065a5677d4278e429561b458b +Subproject commit e67a426ff219bb9a23e7a85e71db67798bb6c0b3 From f9385b74c4e384485ca3f223a252b28331551ce3 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 22 Apr 2022 23:25:35 +0300 Subject: [PATCH 003/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index e67a426..8da0469 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit e67a426ff219bb9a23e7a85e71db67798bb6c0b3 +Subproject commit 8da0469dbf76b03529bcd494495fc72846c13420 From 0ab1cdadddca7ef1378cde1c6742bb4f27c5a8e8 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 23 Apr 2022 00:45:01 +0300 Subject: [PATCH 004/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 8da0469..7a458c5 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 8da0469dbf76b03529bcd494495fc72846c13420 +Subproject commit 7a458c5cbe1e85280614b26fa1270034b06933f1 From 17e292bc58564b3c503d463601cca682060379a6 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 3 May 2022 18:57:16 +0300 Subject: [PATCH 005/266] new PIP --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 7a458c5..28ce6e8 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 7a458c5cbe1e85280614b26fa1270034b06933f1 +Subproject commit 28ce6e8f3f9a5d7197daeeb441a7e01a1623fd72 diff --git a/qad b/qad index d818d19..1a8b442 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit d818d19926385fd91a62f2cd4335b87c7a692904 +Subproject commit 1a8b442aaa38d090ef5625f5f7f8a865a14d7be8 From 000114b53f55e9d8121c92bcbfa8fe72443c4a22 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 9 Jun 2022 13:23:55 +0300 Subject: [PATCH 006/266] pip 2.39 and all other --- cmake | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake b/cmake index 6063123..ff7ec23 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 6063123ee014bb84f3aa4e3a8bbb4bddd390f094 +Subproject commit ff7ec2320cb943640615632daad39a01b307d595 diff --git a/pip b/pip index 28ce6e8..12c0323 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 28ce6e8f3f9a5d7197daeeb441a7e01a1623fd72 +Subproject commit 12c032392cdec4b6578f451e2eec53849f5e1500 diff --git a/qad b/qad index 1a8b442..f9f49d6 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 1a8b442aaa38d090ef5625f5f7f8a865a14d7be8 +Subproject commit f9f49d605c62715e53af1e1c165065303db46e9f From 2faecd4183e53f20b01e177e94df7656c0e87787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=BB?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 9 Jun 2022 13:50:36 +0300 Subject: [PATCH 007/266] update submodules --- cmake | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake b/cmake index 6063123..ff7ec23 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 6063123ee014bb84f3aa4e3a8bbb4bddd390f094 +Subproject commit ff7ec2320cb943640615632daad39a01b307d595 diff --git a/pip b/pip index 28ce6e8..12c0323 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 28ce6e8f3f9a5d7197daeeb441a7e01a1623fd72 +Subproject commit 12c032392cdec4b6578f451e2eec53849f5e1500 diff --git a/qad b/qad index ebe7f3f..9c17b39 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit ebe7f3fc73f8f08142a4d38c3bf49d019a7da7ad +Subproject commit 9c17b394090569a1ee6df7eb10c7d943a6ecf4b2 From 4195aa9f52d038836286a5ece48ccbe4fe8b5909 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 4 Aug 2022 11:37:46 +0300 Subject: [PATCH 008/266] update qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 2fb937a..4c0e61f 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 2fb937a0904c25d1f7f2cd95d2d1452efa96f350 +Subproject commit 4c0e61fdb6a4efd09aec267331699c8cc41ae892 From d8b843c8e8e533538ee4e5d89329e64bed0da07b Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 7 Aug 2022 22:08:21 +0300 Subject: [PATCH 009/266] PIP 2.99, new SHSTKMacros --- cd | 2 +- cmake | 2 +- pip | 2 +- qad | 2 +- qglengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cd b/cd index 7164a84..556191d 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 7164a8447c0a607bce3cdd03fce99bacca4cd74d +Subproject commit 556191d443a9c50bdab900958970be4b3e5c6c7d diff --git a/cmake b/cmake index ff7ec23..7bca337 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit ff7ec2320cb943640615632daad39a01b307d595 +Subproject commit 7bca337d1f3d9cfbbedf673383fe71c54cef8760 diff --git a/pip b/pip index 12c0323..8551499 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 12c032392cdec4b6578f451e2eec53849f5e1500 +Subproject commit 8551499a5e87e5fff0d7b1a5b0f947624566fa49 diff --git a/qad b/qad index 9c17b39..cddc0b6 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 9c17b394090569a1ee6df7eb10c7d943a6ecf4b2 +Subproject commit cddc0b6d917a8fedd014d8fd649f7a4da3223e41 diff --git a/qglengine b/qglengine index 37e2b23..80e5f76 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 37e2b236f5c42441d4a02268939647d32626a343 +Subproject commit 80e5f76ee478ee1b19e81ea3f2943bd5f15d9908 From da1c314ad8e43cbfc54cc5205337993cf972458a Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 10 Aug 2022 22:58:21 +0300 Subject: [PATCH 010/266] pip v3 --- cd | 2 +- cmake | 2 +- pip | 2 +- qad | 2 +- qglengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cd b/cd index 556191d..6e11617 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 556191d443a9c50bdab900958970be4b3e5c6c7d +Subproject commit 6e11617ce85e6de539b33a79a9087b2588469a72 diff --git a/cmake b/cmake index 7bca337..4652685 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 7bca337d1f3d9cfbbedf673383fe71c54cef8760 +Subproject commit 46526851f5fb512e024e0fc2071b4a04445c2498 diff --git a/pip b/pip index 8551499..1acd29e 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 8551499a5e87e5fff0d7b1a5b0f947624566fa49 +Subproject commit 1acd29e4743765b1ed90ebd02dda08dedfb2bc33 diff --git a/qad b/qad index cddc0b6..4e01ad4 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit cddc0b6d917a8fedd014d8fd649f7a4da3223e41 +Subproject commit 4e01ad44652fb43c0e546ad23fa9f6f97ff59b34 diff --git a/qglengine b/qglengine index 80e5f76..c865f9f 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 80e5f76ee478ee1b19e81ea3f2943bd5f15d9908 +Subproject commit c865f9fc947ab005552c62af0dd6d4961f39ff57 From af9493cf6725b7e115d63af034e488a19de48f7c Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 10 Aug 2022 23:44:40 +0300 Subject: [PATCH 011/266] ready to release --- cd | 2 +- pip | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cd b/cd index 6e11617..fcaddf6 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 6e11617ce85e6de539b33a79a9087b2588469a72 +Subproject commit fcaddf6ec89cb677175c0147248d8e63ffb63c17 diff --git a/pip b/pip index 1acd29e..fed2c59 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 1acd29e4743765b1ed90ebd02dda08dedfb2bc33 +Subproject commit fed2c5991de4e25a729241eb21d8fe912d619a12 From a74f845cee1cf1c07034d02d6bbb7a81cc593421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 11 Aug 2022 11:41:59 +0300 Subject: [PATCH 012/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index fed2c59..f07f814 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit fed2c5991de4e25a729241eb21d8fe912d619a12 +Subproject commit f07f814b081c0a1365cdd92938f5e56f6f423372 From ce9bf3f2092f2227b96bdab85aad494b5db4e6ce Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 18 Sep 2022 12:33:56 +0300 Subject: [PATCH 013/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index f07f814..499ee38 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f07f814b081c0a1365cdd92938f5e56f6f423372 +Subproject commit 499ee386a7d3a068991673a524531c191eda65dd From 0809ce5af687df3945d92746486bcdd6d1e2147c Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 18 Sep 2022 12:36:19 +0300 Subject: [PATCH 014/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 499ee38..38840c5 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 499ee386a7d3a068991673a524531c191eda65dd +Subproject commit 38840c5b7db42e11c8f3a44cfdaf5bb733fff8fa From 1db79b7e60f909e8da4801c67a8de091cb31cbfd Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 13 Oct 2022 23:08:23 +0300 Subject: [PATCH 015/266] qglengine --- qglengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qglengine b/qglengine index c865f9f..1afa4ea 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit c865f9fc947ab005552c62af0dd6d4961f39ff57 +Subproject commit 1afa4ea368fcdc529cb02e978e091cf44dea44a1 From f0f804a69b98ee348a58eff7a14f9129f3efd814 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 26 Oct 2022 21:17:30 +0300 Subject: [PATCH 016/266] qglengine getImage --- qglengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qglengine b/qglengine index c865f9f..0f993e6 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit c865f9fc947ab005552c62af0dd6d4961f39ff57 +Subproject commit 0f993e6c1c24bd74893d3553a35bdbfc043f0b4a From 9b5ac6acaa3cda57a4429b4d9ce9e38eef715374 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 28 Oct 2022 13:42:42 +0300 Subject: [PATCH 017/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 38840c5..ca403ca 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 38840c5b7db42e11c8f3a44cfdaf5bb733fff8fa +Subproject commit ca403ca2c74afe43740d5a4c10b8b83a5e9c89e8 diff --git a/qad b/qad index 4e01ad4..7b3595d 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 4e01ad44652fb43c0e546ad23fa9f6f97ff59b34 +Subproject commit 7b3595d900e0f4f60e9c4babbcb320db9881c939 From b11493595938c545d93c7cea30e93270d1deeed0 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 28 Oct 2022 19:43:59 +0300 Subject: [PATCH 018/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 7b3595d..749f967 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 7b3595d900e0f4f60e9c4babbcb320db9881c939 +Subproject commit 749f967a15d83c44fc2101d1e8dcc045a62915a8 From 4156c945c0b10377f285d39dc1c0e3ac1a9dbf4d Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 10 Nov 2022 16:17:08 +0300 Subject: [PATCH 019/266] pip, cd --- cd | 2 +- pip | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cd b/cd index fcaddf6..c21f3c3 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit fcaddf6ec89cb677175c0147248d8e63ffb63c17 +Subproject commit c21f3c3c2d15e97068e5208fb878f3c7c2b10ef1 diff --git a/pip b/pip index ca403ca..56fd6b9 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ca403ca2c74afe43740d5a4c10b8b83a5e9c89e8 +Subproject commit 56fd6b921e41c124fd1952284ffb383868657cb3 From 8871b29819e186414e0279a76b46262bbad4e4ad Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 10 Nov 2022 19:37:09 +0300 Subject: [PATCH 020/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 56fd6b9..ec8fbcb 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 56fd6b921e41c124fd1952284ffb383868657cb3 +Subproject commit ec8fbcb1122ac11d2895fdac8f77be8e8b194ac5 From 87f71130577349441e53d2f4d0fb6de0a708fdc9 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 11 Nov 2022 16:29:10 +0300 Subject: [PATCH 021/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ec8fbcb..7bbffef 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ec8fbcb1122ac11d2895fdac8f77be8e8b194ac5 +Subproject commit 7bbffef2376b2557a944949648c5cdda15db5926 From 4158c263e019e733481bef7b79d0f8e756b80ddb Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 12 Nov 2022 13:31:50 +0300 Subject: [PATCH 022/266] pip, wad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 7bbffef..e912877 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 7bbffef2376b2557a944949648c5cdda15db5926 +Subproject commit e9128771db43b2d886ba1d56472ead73eb3f59c4 diff --git a/qad b/qad index 749f967..99a5276 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 749f967a15d83c44fc2101d1e8dcc045a62915a8 +Subproject commit 99a527657357e80b1c85c63b952a4483e327eb86 From 751c9370d77a7cd5c23740ea7cfd89299435ffcc Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 12 Nov 2022 13:38:12 +0300 Subject: [PATCH 023/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index e912877..46751ab 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit e9128771db43b2d886ba1d56472ead73eb3f59c4 +Subproject commit 46751ab977ee43318f382060953fbaa6aeee5a0f From 56fc0616994b5e045682a04169b3bc76bbc9a476 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 15 Nov 2022 09:50:06 +0300 Subject: [PATCH 024/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 46751ab..d45996a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 46751ab977ee43318f382060953fbaa6aeee5a0f +Subproject commit d45996af280d945a26a22887d9df10b8838396f6 From 038ce7476b1c02277cbea0b838308310a878c3ba Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 24 Nov 2022 15:29:41 +0300 Subject: [PATCH 025/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 99a5276..5e49446 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 99a527657357e80b1c85c63b952a4483e327eb86 +Subproject commit 5e4944660790c6837b13b5beabfd55d4942599d2 From e7755da10c6e37ff7bcd7073ccabc44092b4cfa9 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 7 Dec 2022 10:56:10 +0300 Subject: [PATCH 026/266] pip,qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index d45996a..b609ce8 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit d45996af280d945a26a22887d9df10b8838396f6 +Subproject commit b609ce80270042eac00313111662b87ad653487a diff --git a/qad b/qad index 5e49446..5d9381d 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 5e4944660790c6837b13b5beabfd55d4942599d2 +Subproject commit 5d9381dd37846e8cfeb5a8235dfdd3ee16fc19ef From 9b0d5a0a75989cb8eabb9ac655cbf67198820c39 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 12 Dec 2022 12:42:36 +0300 Subject: [PATCH 027/266] add .clang-format file --- .clang-format | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++ cd | 2 +- pip | 2 +- qad | 2 +- qglengine | 2 +- 5 files changed, 227 insertions(+), 4 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..186f7ab --- /dev/null +++ b/.clang-format @@ -0,0 +1,223 @@ +--- +Language: Cpp +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignArrayOfStructures: Left +AlignConsecutiveAssignments: + Enabled: true + AcrossEmptyLines: true + AcrossComments: true + AlignCompound: false + PadOperators: true +AlignConsecutiveBitFields: + Enabled: true + AcrossEmptyLines: false + AcrossComments: true + AlignCompound: false + PadOperators: true +AlignConsecutiveDeclarations: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + PadOperators: false +AlignConsecutiveMacros: + Enabled: true + AcrossEmptyLines: true + AcrossComments: true + AlignCompound: false + PadOperators: true +AlignEscapedNewlines: Left +AlignOperands: Align +AlignTrailingComments: true +AllowAllArgumentsOnNextLine: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortEnumsOnASingleLine: false +AllowShortBlocksOnASingleLine: Empty +AllowShortCaseLabelsOnASingleLine: true +AllowShortFunctionsOnASingleLine: Inline +AllowShortLambdasOnASingleLine: All +AllowShortIfStatementsOnASingleLine: WithoutElse +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: Yes +AttributeMacros: + - __capability +BinPackArguments: false +BinPackParameters: false +BraceWrapping: + AfterCaseLabel: false + AfterClass: false + AfterControlStatement: Never + AfterEnum: false + AfterFunction: false + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + AfterExternBlock: false + BeforeCatch: false + BeforeElse: false + BeforeLambdaBody: false + BeforeWhile: false + IndentBraces: false + SplitEmptyFunction: false + SplitEmptyRecord: false + SplitEmptyNamespace: true +BreakBeforeBinaryOperators: None +BreakBeforeConceptDeclarations: Always +BreakBeforeBraces: Attach +BreakInheritanceList: BeforeComma +BreakBeforeTernaryOperators: true +BreakConstructorInitializers: BeforeComma +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: true +ColumnLimit: 140 +CommentPragmas: '^ IWYU pragma:' +QualifierAlignment: Leave +CompactNamespaces: false +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: true +DeriveLineEnding: false +DerivePointerAlignment: false +DisableFormat: false +EmptyLineAfterAccessModifier: Never +EmptyLineBeforeAccessModifier: Always +ExperimentalAutoDetectBinPacking: false +PackConstructorInitializers: CurrentLine +BasedOnStyle: '' +ConstructorInitializerAllOnOneLineOrOnePerLine: true +AllowAllConstructorInitializersOnNextLine: true +FixNamespaceComments: true +ForEachMacros: + - foreach + - Q_FOREACH + - BOOST_FOREACH + - piForeach + - piForeachC + - piForeachR + - piForeachRC + - piForeachCR +IfMacros: + - KJ_IF_MAYBE +IncludeBlocks: Regroup +IncludeCategories: + - Regex: '^"(llvm|llvm-c|clang|clang-c)/' + Priority: 2 + SortPriority: 0 + CaseSensitive: false + - Regex: '^(<|"(gtest|gmock|isl|json)/)' + Priority: 3 + SortPriority: 0 + CaseSensitive: false + - Regex: '.*' + Priority: 1 + SortPriority: 0 + CaseSensitive: false +IncludeIsMainRegex: '(Test)?$' +IncludeIsMainSourceRegex: '' +IndentAccessModifiers: false +IndentCaseLabels: false +IndentCaseBlocks: false +IndentGotoLabels: false +IndentPPDirectives: AfterHash +IndentExternBlock: NoIndent +IndentRequiresClause: true +IndentWidth: 4 +IndentWrappedFunctionNames: false +InsertBraces: false +InsertTrailingCommas: Wrapped +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: false +LambdaBodyIndentation: Signature +MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN" +MacroBlockEnd: "PRIVATE_DEFINITION_END|STATIC_INITIALIZER_END" +MaxEmptyLinesToKeep: 2 +NamespaceIndentation: None +ObjCBinPackProtocolList: Auto +ObjCBlockIndentWidth: 2 +ObjCBreakBeforeNestedBlockParam: true +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PenaltyBreakAssignment: 2 +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakOpenParenthesis: 0 +PenaltyBreakString: 1000 +PenaltyBreakTemplateDeclaration: 10 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 60 +PenaltyIndentedWhitespace: 0 +PointerAlignment: Middle +PPIndentWidth: 2 +ReferenceAlignment: Middle +ReflowComments: true +RemoveBracesLLVM: false +RequiresClausePosition: OwnLine +SeparateDefinitionBlocks: Leave +ShortNamespaceLines: 1 +SortIncludes: CaseSensitive +SortJavaStaticImport: Before +SortUsingDeclarations: true +SpaceAfterCStyleCast: false +SpaceAfterLogicalNot: false +SpaceAfterTemplateKeyword: false +SpaceBeforeAssignmentOperators: true +SpaceBeforeCaseColon: false +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: false +SpaceBeforeInheritanceColon: false +SpaceBeforeParens: ControlStatementsExceptControlMacros +SpaceBeforeParensOptions: + AfterControlStatements: true + AfterForeachMacros: false + AfterFunctionDefinitionName: false + AfterFunctionDeclarationName: false + AfterIfMacros: false + AfterOverloadedOperator: false + AfterRequiresInClause: false + AfterRequiresInExpression: false + BeforeNonEmptyParentheses: false +SpaceAroundPointerQualifiers: Both +SpaceBeforeRangeBasedForLoopColon: false +SpaceInEmptyBlock: false +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: Never +SpacesInConditionalStatement: false +SpacesInContainerLiterals: false +SpacesInCStyleCastParentheses: false +SpacesInLineCommentPrefix: + Minimum: 1 + Maximum: -1 +SpacesInParentheses: false +SpacesInSquareBrackets: false +SpaceBeforeSquareBrackets: false +BitFieldColonSpacing: After +Standard: c++11 +StatementAttributeLikeMacros: + - Q_EMIT + - PIMETA +StatementMacros: + - Q_UNUSED + - QT_REQUIRE_VERSION + - PRIVATE_DECLARATION + - NO_COPY_CLASS + - FOREVER_WAIT + - WAIT_FOREVER +TabWidth: 4 +UseCRLF: false +UseTab: AlignWithSpaces +WhitespaceSensitiveMacros: + - STRINGIZE + - PP_STRINGIZE + - BOOST_PP_STRINGIZE + - NS_SWIFT_NAME + - CF_SWIFT_NAME +... + diff --git a/cd b/cd index c21f3c3..37480c9 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit c21f3c3c2d15e97068e5208fb878f3c7c2b10ef1 +Subproject commit 37480c9d1f36f5d6a98d45f1aefda7275d0bee1f diff --git a/pip b/pip index b609ce8..9d9357b 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b609ce80270042eac00313111662b87ad653487a +Subproject commit 9d9357b0ca0c19d53f0e7f994d86f0a145bfdf17 diff --git a/qad b/qad index 5d9381d..aa75818 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 5d9381dd37846e8cfeb5a8235dfdd3ee16fc19ef +Subproject commit aa7581803e27bd2ebef56078d0adbc458fdc5d90 diff --git a/qglengine b/qglengine index 0f993e6..1dfca0a 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 0f993e6c1c24bd74893d3553a35bdbfc043f0b4a +Subproject commit 1dfca0aeaba393b7042d7276e47eb65007c08dfd From 1c1284caa0211bb640b006f1db7a3463621d1b1c Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 16 Dec 2022 16:45:44 +0300 Subject: [PATCH 028/266] .editorconfig, format, pivaluetree, pivaluetreeedit --- .editorconfig | 6 ++++++ cd | 2 +- cmake | 2 +- pip | 2 +- qad | 2 +- qglengine | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..3f43534 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,6 @@ +root = true + +[*.{h,c,cpp}] +charset = utf-8 +indent_style = tab +tab_width = 4 diff --git a/cd b/cd index 37480c9..cf1e809 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 37480c9d1f36f5d6a98d45f1aefda7275d0bee1f +Subproject commit cf1e809290f916d3a780f9827cddade649e13b30 diff --git a/cmake b/cmake index 4652685..8f898b1 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 46526851f5fb512e024e0fc2071b4a04445c2498 +Subproject commit 8f898b103dddd9911f7b6c15d69b26cf317d4acc diff --git a/pip b/pip index 9d9357b..581c7c9 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9d9357b0ca0c19d53f0e7f994d86f0a145bfdf17 +Subproject commit 581c7c937a1a7f5a1f662bc0826b71858fb2d016 diff --git a/qad b/qad index aa75818..55e5e81 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit aa7581803e27bd2ebef56078d0adbc458fdc5d90 +Subproject commit 55e5e819f8e6a7d6b122f0076923ed4737ffc83c diff --git a/qglengine b/qglengine index 1dfca0a..b200681 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 1dfca0aeaba393b7042d7276e47eb65007c08dfd +Subproject commit b20068165f5c21b2ba824cf0ea2a8ebd91cf0134 From f6d4f9bbacc254ea14dbf0139df520ca83f8e189 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 9 Jan 2023 15:43:30 +0300 Subject: [PATCH 029/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 581c7c9..9ed66db 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 581c7c937a1a7f5a1f662bc0826b71858fb2d016 +Subproject commit 9ed66db5159f6baff84531a3f6b7926a20ca83e4 diff --git a/qad b/qad index 55e5e81..10d63e0 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 55e5e819f8e6a7d6b122f0076923ed4737ffc83c +Subproject commit 10d63e05feda638dcd745ed1f759f1d65d28ceed From 9238b8bf1bb0b4b2a78cb260b051c41a65d24e54 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 9 Jan 2023 15:51:55 +0300 Subject: [PATCH 030/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 10d63e0..10212e2 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 10d63e05feda638dcd745ed1f759f1d65d28ceed +Subproject commit 10212e2ebd7a33ffa4018f0f5d25cba25ec7a583 From 84c7a86f3450a2910485725286e82cfe9e824ae2 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 10 Jan 2023 12:10:43 +0300 Subject: [PATCH 031/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 9ed66db..73d482e 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9ed66db5159f6baff84531a3f6b7926a20ca83e4 +Subproject commit 73d482ebe261cdea84dbd86367336799c9f601b4 From 10492b57b5841ee047bd9be5c1eca123be7776b6 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 25 Jan 2023 13:21:40 +0300 Subject: [PATCH 032/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 10212e2..4693a17 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 10212e2ebd7a33ffa4018f0f5d25cba25ec7a583 +Subproject commit 4693a1753abf6675f295a89b66df3118cd511542 From 5c3b2740e1094b20d92acceba0f5942bb10ea2f0 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 6 Mar 2023 19:37:32 +0300 Subject: [PATCH 033/266] pip, qad, qgle --- pip | 2 +- qad | 2 +- qglengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip b/pip index 73d482e..e0900b6 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 73d482ebe261cdea84dbd86367336799c9f601b4 +Subproject commit e0900b6bd555257cd12ab2da74be7386071d7a2b diff --git a/qad b/qad index 4693a17..254a88e 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 4693a1753abf6675f295a89b66df3118cd511542 +Subproject commit 254a88e7a4e6b6c50a8a5213f4596d0fb43f281c diff --git a/qglengine b/qglengine index b200681..64eee9e 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit b20068165f5c21b2ba824cf0ea2a8ebd91cf0134 +Subproject commit 64eee9e60751d07cdcf619f0dfc022276721a5d7 From 58f739f99b2180483a2214cb66c6ffad55ebf31c Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 6 Mar 2023 19:53:50 +0300 Subject: [PATCH 034/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 254a88e..17fc04c 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 254a88e7a4e6b6c50a8a5213f4596d0fb43f281c +Subproject commit 17fc04c2c6edc65c98d7a1920c04e7e1dd184cf6 From a3c80f5fd156b6bfbaf0aa2baccd7e5b461f1099 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 7 Mar 2023 11:05:32 +0300 Subject: [PATCH 035/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 17fc04c..eb1e971 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 17fc04c2c6edc65c98d7a1920c04e7e1dd184cf6 +Subproject commit eb1e971bcdbeb953ece0df31a0336ce268a4e6ee From 6cbae1187ec52d89ffcc3556c14e4648439ea0ba Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 7 Mar 2023 18:19:09 +0300 Subject: [PATCH 036/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index eb1e971..e9b9958 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit eb1e971bcdbeb953ece0df31a0336ce268a4e6ee +Subproject commit e9b995879a5cc705f76b7675a64f70141e1f93f6 From 66572991ba2416ff53fb52f4d85a54564f801b85 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 7 Mar 2023 16:23:47 +0300 Subject: [PATCH 037/266] qglengine and cd --- cd | 2 +- qglengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cd b/cd index cf1e809..e5a4609 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit cf1e809290f916d3a780f9827cddade649e13b30 +Subproject commit e5a46097f1ec32fe1b61e3dfeaf3f6a51033e3dd diff --git a/qglengine b/qglengine index 64eee9e..3ee778c 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 64eee9e60751d07cdcf619f0dfc022276721a5d7 +Subproject commit 3ee778cb92602136f5cfce0be7d2b2aaf0399195 From 34fa2bd3756690ee1454e0fe6e6789e8e6a25076 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 14 Mar 2023 10:38:29 +0300 Subject: [PATCH 038/266] cd pip --- cd | 2 +- pip | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cd b/cd index e5a4609..24c69ed 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit e5a46097f1ec32fe1b61e3dfeaf3f6a51033e3dd +Subproject commit 24c69edb82af8a368b2bd6131fa94899761b83a3 diff --git a/pip b/pip index e0900b6..162f8e2 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit e0900b6bd555257cd12ab2da74be7386071d7a2b +Subproject commit 162f8e25fde74a05a2483e82e10d69692f43b895 From 81a4234f6ce0c5e2637ff1de833fb60a680b6e86 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 14 Mar 2023 17:41:24 +0300 Subject: [PATCH 039/266] pip, qglengine --- pip | 2 +- qglengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 162f8e2..504fc5c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 162f8e25fde74a05a2483e82e10d69692f43b895 +Subproject commit 504fc5c89669dd5948a293a0fb212afdc62c88eb diff --git a/qglengine b/qglengine index 3ee778c..9e7afb5 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 3ee778cb92602136f5cfce0be7d2b2aaf0399195 +Subproject commit 9e7afb5fb5334f42f24f24df8a625ef6c8d7cb7b From 3141612a22606185889a55b4cbf78bbd4d498b5c Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 21 Mar 2023 13:51:26 +0300 Subject: [PATCH 040/266] cmake pip qad qglengine --- cmake | 2 +- pip | 2 +- qad | 2 +- qglengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake b/cmake index 8f898b1..43a9d8b 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 8f898b103dddd9911f7b6c15d69b26cf317d4acc +Subproject commit 43a9d8be6f3c769065242e51aa28db9a4b9426b2 diff --git a/pip b/pip index 504fc5c..49f5de2 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 504fc5c89669dd5948a293a0fb212afdc62c88eb +Subproject commit 49f5de26eb624556c152f7b564911a817185807e diff --git a/qad b/qad index e9b9958..fb6bcf7 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit e9b995879a5cc705f76b7675a64f70141e1f93f6 +Subproject commit fb6bcf7881d5a637fb55672b4e4365975bd65f7b diff --git a/qglengine b/qglengine index 9e7afb5..c179bc9 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 9e7afb5fb5334f42f24f24df8a625ef6c8d7cb7b +Subproject commit c179bc95cfbbcc160606113120eba7980fa3353a From e77101ad3721af1f4482ed11ed908d87d4bbc99a Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 21 Mar 2023 13:54:53 +0300 Subject: [PATCH 041/266] pip version --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 49f5de2..20bdf3a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 49f5de26eb624556c152f7b564911a817185807e +Subproject commit 20bdf3af61d00122a9a4745b4fdcaf709cfa3626 From ef944f881f555fd9c905bced79d344cbbeb8976a Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 21 Mar 2023 14:48:30 +0300 Subject: [PATCH 042/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 20bdf3a..d66f7ef 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 20bdf3af61d00122a9a4745b4fdcaf709cfa3626 +Subproject commit d66f7efb3cc7bd303320c6491cb80b2973fcdaa5 From 4071da8d6743b9356327ce368958e99073d3cc1f Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 25 Mar 2023 18:51:51 +0300 Subject: [PATCH 043/266] try migrate to "linux.json" for dockers --- Jenkinsfile | 37 ++++++++++++++----- docker/debian11-shstk/Dockerfile | 18 --------- .../Dockerfile | 5 ++- docker/ubuntu-shstk/Dockerfile | 18 --------- pip | 2 +- 5 files changed, 31 insertions(+), 49 deletions(-) delete mode 100644 docker/debian11-shstk/Dockerfile rename docker/{debian-shstk => linux_desktop-shstk}/Dockerfile (85%) delete mode 100644 docker/ubuntu-shstk/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index 5547efe..f3175d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -def build_docker(name, release_dir) { +def build_docker(name, docker_dir, docker_image, release_dir) { def image_name = "${name}-shstk" echo "Build image ${image_name}" def pref = "" @@ -9,13 +9,17 @@ def build_docker(name, release_dir) { if (env.JOBS_COUNT) { jobs = "${env.JOBS_COUNT}" } - def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=${jobs}" - dir ("docker/${image_name}") { - sh "docker build ${args} --no-cache -t ${image_name} ." - def diargs = "-v " + release_dir + ":/soft/release" - docker.image(image_name).inside(diargs) { - sh 'cp -vf /soft/shstk/release/* /soft/release/ || true' - } + def args = "${pref}" + args += " --build-arg IMAGE_FROM=${docker_image}" + args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" + args += " --build-arg JOBS_COUNT=${jobs}" + dir ("docker/${docker_dir}-shstk") { + //sh "docker build ${args} --no-cache -t ${image_name} ." + //def diargs = "-v " + release_dir + ":/soft/release" + //docker.image(image_name).inside(diargs) { + // sh 'cp -vf /soft/shstk/release/* /soft/release/ || true' + //} + print "docker build ${args} --no-cache -t ${image_name} ." } return "\n - ${image_name}" } @@ -38,14 +42,27 @@ node { sh "rm -rvf ${rel_dir}" sh "mkdir -p ${rel_dir}" def _msg = "Built images:" - def platforms = ['debian', 'debian11', 'osx', 'windows', 'windows32', 'android', 'pi', 'ubuntu'] + + // individual platforms + def platforms = ['osx', 'android', 'windows', 'windows32', 'pi'] for (int i = 0; i < platforms.size(); ++i) { if (_envmap["BUILD_${platforms[i]}"] == "1") { stage("${platforms[i]}-shstk") { - _msg += build_docker("${platforms[i]}", rel_dir) + _msg += build_docker("${platforms[i]}", "${platforms[i]}", "", rel_dir) } } } + + // desktop linux set + sh 'wget https://shs.tools/files/linux.json' + def root = readJSON(file: 'linux.json') + for (dist in root.Linux) { + if (dist.off) continue + stage ("${dist.system}-shstk") { + _msg += build_docker(dist.docker_image, "linux_desktop", dist.docker_image, rel_dir) + } + } + sh "docker system prune -f" archiveArtifacts 'release/*' echo "${_msg}" diff --git a/docker/debian11-shstk/Dockerfile b/docker/debian11-shstk/Dockerfile deleted file mode 100644 index 5555e28..0000000 --- a/docker/debian11-shstk/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -ARG DOCKER_PREFIX=wapmobil/ -FROM ${DOCKER_PREFIX}debian11 - -ARG LIBS_BUILD_NUMBER=9999 -ARG JOBS_COUNT=4 -ENV PATH=/opt/cmake/bin:$PATH - -WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git - -WORKDIR /soft/shstk_build_debian -RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ - && cmake --build ./ --target install -j${JOBS_COUNT} \ - && cmake --build ./ --target deploy -j${JOBS_COUNT} \ - && rm -rf * \ - && ldconfig - -WORKDIR /soft/src diff --git a/docker/debian-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile similarity index 85% rename from docker/debian-shstk/Dockerfile rename to docker/linux_desktop-shstk/Dockerfile index 67ce6be..43ed8a7 100644 --- a/docker/debian-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ -FROM ${DOCKER_PREFIX}debian +ARG IMAGE_FROM +FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 @@ -8,7 +9,7 @@ ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git -WORKDIR /soft/shstk_build_debian +WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ diff --git a/docker/ubuntu-shstk/Dockerfile b/docker/ubuntu-shstk/Dockerfile deleted file mode 100644 index 79aeef1..0000000 --- a/docker/ubuntu-shstk/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -ARG DOCKER_PREFIX=wapmobil/ -FROM ${DOCKER_PREFIX}ubuntu - -ARG LIBS_BUILD_NUMBER=9999 -ARG JOBS_COUNT=4 -ENV PATH=/opt/cmake/bin:$PATH - -WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git - -WORKDIR /soft/shstk_build_ubuntu -RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ - && cmake --build ./ --target install -j${JOBS_COUNT} \ - && cmake --build ./ --target deploy -j${JOBS_COUNT} \ - && rm -rf * \ - && ldconfig - -WORKDIR /soft/src diff --git a/pip b/pip index d66f7ef..2d1c86b 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit d66f7efb3cc7bd303320c6491cb80b2973fcdaa5 +Subproject commit 2d1c86bc8335aedb81cdf7887920ed07c4c01c7c From 26ae6c4fbbf589b34cd324ea46f5a557581b42eb Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 25 Mar 2023 18:53:48 +0300 Subject: [PATCH 044/266] try to build dockers --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f3175d0..fde7a8e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,12 +14,12 @@ def build_docker(name, docker_dir, docker_image, release_dir) { args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg JOBS_COUNT=${jobs}" dir ("docker/${docker_dir}-shstk") { - //sh "docker build ${args} --no-cache -t ${image_name} ." - //def diargs = "-v " + release_dir + ":/soft/release" - //docker.image(image_name).inside(diargs) { - // sh 'cp -vf /soft/shstk/release/* /soft/release/ || true' - //} - print "docker build ${args} --no-cache -t ${image_name} ." + sh "docker build ${args} --no-cache -t ${image_name} ." + def diargs = "-v " + release_dir + ":/soft/release" + docker.image(image_name).inside(diargs) { + sh 'cp -vf /soft/shstk/release/* /soft/release/ || true' + } + //print "docker build ${args} --no-cache -t ${image_name} ." } return "\n - ${image_name}" } From 7659df592bbf3516d470627834ac80617e612c18 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 26 Mar 2023 18:21:51 +0300 Subject: [PATCH 045/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 2d1c86b..eb91ee1 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 2d1c86bc8335aedb81cdf7887920ed07c4c01c7c +Subproject commit eb91ee1b3589b990812ef99cb63b76e282bbef2f From 1bbf8393a472812a14d26505be0169dbc19f3e42 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 26 Mar 2023 20:55:25 +0300 Subject: [PATCH 046/266] release fix --- docker/linux_desktop-shstk/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index 43ed8a7..f79a981 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -12,8 +12,8 @@ RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.t WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && cmake --build ./ --target install -j${JOBS_COUNT} \ + && ldconfig \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ - && rm -rf * \ - && ldconfig + && rm -rf * WORKDIR /soft/src From aa809584b96c5a6ed552545921a6293cff2fdc1d Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 4 Apr 2023 13:29:37 +0300 Subject: [PATCH 047/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index eb91ee1..4af5886 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit eb91ee1b3589b990812ef99cb63b76e282bbef2f +Subproject commit 4af5886649a8ff716f8c153e0a29072d87c45718 diff --git a/qad b/qad index fb6bcf7..396b1bc 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit fb6bcf7881d5a637fb55672b4e4365975bd65f7b +Subproject commit 396b1bc309a131f14ed35b07453cc469480664c8 From d79ce8bee716ec9e5dde96b476da59e37d4262d3 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 5 Apr 2023 12:26:21 +0300 Subject: [PATCH 048/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 4af5886..6d3b7c8 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 4af5886649a8ff716f8c153e0a29072d87c45718 +Subproject commit 6d3b7c8543220b9500c9771addae4fce5ac11e18 From 7b0fb7693c39bbeb7524e862d0ad8cce140bd37d Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 7 Apr 2023 19:44:52 +0300 Subject: [PATCH 049/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 6d3b7c8..254649a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 6d3b7c8543220b9500c9771addae4fce5ac11e18 +Subproject commit 254649aa10231cf43fca42d04b1a7ac94e899113 From d49191dfebaccc49b60cde02eb7fbaf8701dc4c1 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 10 Apr 2023 13:17:57 +0300 Subject: [PATCH 050/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 254649a..dea469d 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 254649aa10231cf43fca42d04b1a7ac94e899113 +Subproject commit dea469d85e71f10ce2cb626683edf8a5fa09963d diff --git a/qad b/qad index 396b1bc..8930495 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 396b1bc309a131f14ed35b07453cc469480664c8 +Subproject commit 893049550be1de408600bef52805669047ea08f7 From a59b1779b231abb31b073ea9dd8958df7667c2a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 17 Apr 2023 15:52:44 +0300 Subject: [PATCH 051/266] update pip and qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index dea469d..2780dac 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit dea469d85e71f10ce2cb626683edf8a5fa09963d +Subproject commit 2780dacb480bb008922606cd007a49d18dc3dff7 diff --git a/qad b/qad index 8930495..0497a52 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 893049550be1de408600bef52805669047ea08f7 +Subproject commit 0497a527047ac8e1e977485647219e257a18d919 From eb2a852aec0ddf965a39e4745f4be9f3d1095b01 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 18 Apr 2023 14:06:35 +0300 Subject: [PATCH 052/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 0497a52..2f63043 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 0497a527047ac8e1e977485647219e257a18d919 +Subproject commit 2f630435bb0c39e5fbf779b957db1542f3690fe2 From ffcbea0bbc1e76365145c47968055854533201b1 Mon Sep 17 00:00:00 2001 From: Andrey Bychkov Date: Fri, 21 Apr 2023 12:11:31 +0300 Subject: [PATCH 053/266] Jenkinsfile refactoring --- Jenkinsfile | 66 ++++++++++++++++++----------------------------------- qad | 2 +- 2 files changed, 23 insertions(+), 45 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fde7a8e..a70a930 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,68 +1,46 @@ -def build_docker(name, docker_dir, docker_image, release_dir) { - def image_name = "${name}-shstk" +def build_docker(docker_image, docker_dir, release_dir) { + def image_name = "${docker_image}-shstk" echo "Build image ${image_name}" - def pref = "" + def args = "" if (env.DOCKER_PREFIX) { - pref = "--build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" + args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" } - def jobs = 4 - if (env.JOBS_COUNT) { - jobs = "${env.JOBS_COUNT}" - } - def args = "${pref}" args += " --build-arg IMAGE_FROM=${docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" - args += " --build-arg JOBS_COUNT=${jobs}" - dir ("docker/${docker_dir}-shstk") { - sh "docker build ${args} --no-cache -t ${image_name} ." - def diargs = "-v " + release_dir + ":/soft/release" - docker.image(image_name).inside(diargs) { - sh 'cp -vf /soft/shstk/release/* /soft/release/ || true' - } - //print "docker build ${args} --no-cache -t ${image_name} ." + args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" + def shstk_docker = docker.build(${image_name}, ./docker/${docker_dir}-shstk --no-cache ${args}) + def vol = "-v " + release_dir + ":/soft/release" + shstk_docker.inside(vol) { + sh 'cp -vf /soft/shstk/release/* /soft/release/ || true' } return "\n - ${image_name}" } properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '20']], copyArtifactPermission('*')]); node { - stage("checkout") { + stage("Download SRC") { checkout scm } + + stage("Download platforms.json") { + sh "rm -rf platforms" + sh "git clone --depth 1 ${env.PLATFORMS_GIT} platforms" + } + def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/release' echo "Release to ${rel_dir}" - def _envmap = [:] - def _env = sh(script: "env", returnStdout: true).trim().split("\n") - _env.each{ l -> - def _ind = l.indexOf('='); - def _n = l.substring(0, _ind); - def _v = l.substring(_ind + 1); - _envmap["${_n}"] = "${_v}"; - } - sh "mkdir -p ${rel_dir}" sh "rm -rvf ${rel_dir}" sh "mkdir -p ${rel_dir}" + + def root = readJSON(file: 'platforms/platforms.json') def _msg = "Built images:" - - // individual platforms - def platforms = ['osx', 'android', 'windows', 'windows32', 'pi'] - for (int i = 0; i < platforms.size(); ++i) { - if (_envmap["BUILD_${platforms[i]}"] == "1") { - stage("${platforms[i]}-shstk") { - _msg += build_docker("${platforms[i]}", "${platforms[i]}", "", rel_dir) + root.Platforms.each { key, dist -> + if (dist.enabled) { + stage ("${key}-shstk") { + _msg += build_docker(dist.docker_image, dist.docker_dir, rel_dir) } } } - // desktop linux set - sh 'wget https://shs.tools/files/linux.json' - def root = readJSON(file: 'linux.json') - for (dist in root.Linux) { - if (dist.off) continue - stage ("${dist.system}-shstk") { - _msg += build_docker(dist.docker_image, "linux_desktop", dist.docker_image, rel_dir) - } - } - sh "docker system prune -f" archiveArtifacts 'release/*' echo "${_msg}" diff --git a/qad b/qad index 2f63043..6b4bafd 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 2f630435bb0c39e5fbf779b957db1542f3690fe2 +Subproject commit 6b4bafd9cd95711d105d8131a1f1a5ef1fe6d929 From 1b779f70114bbea2e165a89715bc92029b4514ec Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 21 Apr 2023 13:05:48 +0300 Subject: [PATCH 054/266] space --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a70a930..3134ded 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ def build_docker(docker_image, docker_dir, release_dir) { args += " --build-arg IMAGE_FROM=${docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" - def shstk_docker = docker.build(${image_name}, ./docker/${docker_dir}-shstk --no-cache ${args}) + def shstk_docker = docker.build(${image_name}, ./docker/${docker_dir}-shstk --no-cache ${args}) def vol = "-v " + release_dir + ":/soft/release" shstk_docker.inside(vol) { sh 'cp -vf /soft/shstk/release/* /soft/release/ || true' @@ -31,7 +31,7 @@ node { sh "rm -rvf ${rel_dir}" sh "mkdir -p ${rel_dir}" - def root = readJSON(file: 'platforms/platforms.json') + def root = readJSON(file: 'platforms/platforms.json') def _msg = "Built images:" root.Platforms.each { key, dist -> if (dist.enabled) { From 1916526f38d33bb85b8fdc31449d911a9f362e69 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 21 Apr 2023 13:23:33 +0300 Subject: [PATCH 055/266] fix --- Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3134ded..6200705 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,9 +8,8 @@ def build_docker(docker_image, docker_dir, release_dir) { args += " --build-arg IMAGE_FROM=${docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" - def shstk_docker = docker.build(${image_name}, ./docker/${docker_dir}-shstk --no-cache ${args}) - def vol = "-v " + release_dir + ":/soft/release" - shstk_docker.inside(vol) { + def shstk_docker = docker.build("${image_name}", "./docker/${docker_dir}-shstk --no-cache ${args}") + shstk_docker.inside("-v " + release_dir + ":/soft/release") { sh 'cp -vf /soft/shstk/release/* /soft/release/ || true' } return "\n - ${image_name}" From 13d79f929cd448fe5c40cee22b6935675516cf7d Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 23 Apr 2023 23:16:21 +0300 Subject: [PATCH 056/266] pip, qglengine --- pip | 2 +- qglengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 2780dac..0f19719 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 2780dacb480bb008922606cd007a49d18dc3dff7 +Subproject commit 0f19719a9837f395a4c925ccb17b1112e901f92f diff --git a/qglengine b/qglengine index c179bc9..0151e34 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit c179bc95cfbbcc160606113120eba7980fa3353a +Subproject commit 0151e344779f5dc8132ba5d8c1d0e6824adcb432 From 7b13bba14b93f6ea3d11692872ba9e009f937eef Mon Sep 17 00:00:00 2001 From: Andrey Bychkov Date: Mon, 24 Apr 2023 15:49:25 +0300 Subject: [PATCH 057/266] Jenkinsfile small clean --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6200705..1b64f6e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,9 @@ def build_docker(docker_image, docker_dir, release_dir) { } return "\n - ${image_name}" } + properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '20']], copyArtifactPermission('*')]); + node { stage("Download SRC") { checkout scm @@ -40,7 +42,10 @@ node { } } - sh "docker system prune -f" + stage("Clean") { + sh "docker system prune -f" + } + archiveArtifacts 'release/*' echo "${_msg}" } From 16287ca510f17a3d9ab6753285ee28b273211a9f Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 25 Apr 2023 16:37:56 +0300 Subject: [PATCH 058/266] Jenkinsfile, pip --- Jenkinsfile | 24 ++++++++---------------- pip | 2 +- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1b64f6e..a5fd3af 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,4 @@ +@Library('SHS.Platforms') _ def build_docker(docker_image, docker_dir, release_dir) { def image_name = "${docker_image}-shstk" echo "Build image ${image_name}" @@ -14,36 +15,27 @@ def build_docker(docker_image, docker_dir, release_dir) { } return "\n - ${image_name}" } - properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '20']], copyArtifactPermission('*')]); - node { stage("Download SRC") { checkout scm } - stage("Download platforms.json") { - sh "rm -rf platforms" - sh "git clone --depth 1 ${env.PLATFORMS_GIT} platforms" - } + def pl = new org.SHS.Platforms(this) + pl.get() def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/release' echo "Release to ${rel_dir}" sh "rm -rvf ${rel_dir}" sh "mkdir -p ${rel_dir}" - def root = readJSON(file: 'platforms/platforms.json') def _msg = "Built images:" - root.Platforms.each { key, dist -> - if (dist.enabled) { - stage ("${key}-shstk") { - _msg += build_docker(dist.docker_image, dist.docker_dir, rel_dir) - } - } - } + pl.forEach ({ dist -> + _msg += build_docker(dist.docker_image, dist.docker_dir, rel_dir) + }, stageSuffix: "-shstk") - stage("Clean") { - sh "docker system prune -f" + stage("Clean") { + sh "docker system prune -f" } archiveArtifacts 'release/*' diff --git a/pip b/pip index 0f19719..f503e85 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 0f19719a9837f395a4c925ccb17b1112e901f92f +Subproject commit f503e85507dedf63752711bd4583ef3d98307b88 From c917e58734debdb33ab2349d07182c0314f78487 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 25 Apr 2023 17:35:14 +0300 Subject: [PATCH 059/266] pip, qglengine --- pip | 2 +- qglengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index f503e85..3ab57ee 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f503e85507dedf63752711bd4583ef3d98307b88 +Subproject commit 3ab57eea887b0e6825ff8cc77699350a6c53cc20 diff --git a/qglengine b/qglengine index 0151e34..011c3ee 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 0151e344779f5dc8132ba5d8c1d0e6824adcb432 +Subproject commit 011c3eeb71b306f284ee8059655228b2ec3656cf From 81f650a4ab265772877d27d34c86326b7e303c59 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 26 Apr 2023 18:18:58 +0300 Subject: [PATCH 060/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 6b4bafd..4eefbe4 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 6b4bafd9cd95711d105d8131a1f1a5ef1fe6d929 +Subproject commit 4eefbe4e4675b5aaf742bcdc4b015d90f7ec11a2 From 834e786deaccaa0bebe39be7db76b78dbee37b41 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 4 May 2023 14:14:50 +0300 Subject: [PATCH 061/266] .clang-format --- .clang-format | 1 + cd | 2 +- pip | 2 +- qad | 2 +- qglengine | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.clang-format b/.clang-format index 186f7ab..ab89af9 100644 --- a/.clang-format +++ b/.clang-format @@ -219,5 +219,6 @@ WhitespaceSensitiveMacros: - BOOST_PP_STRINGIZE - NS_SWIFT_NAME - CF_SWIFT_NAME + - PIMETA ... diff --git a/cd b/cd index 24c69ed..f4be39d 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 24c69edb82af8a368b2bd6131fa94899761b83a3 +Subproject commit f4be39d4615375631c156c51136ab5ea0887808e diff --git a/pip b/pip index 3ab57ee..96e8ef2 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 3ab57eea887b0e6825ff8cc77699350a6c53cc20 +Subproject commit 96e8ef2b2337e6c1f285506665e87c1607a66465 diff --git a/qad b/qad index 4eefbe4..f37a8e6 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 4eefbe4e4675b5aaf742bcdc4b015d90f7ec11a2 +Subproject commit f37a8e6d933de54c163ae86eaf93a4a4f50edcdf diff --git a/qglengine b/qglengine index 011c3ee..c275d00 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 011c3eeb71b306f284ee8059655228b2ec3656cf +Subproject commit c275d006d5e58f4a7648ceca3049dd0099a24804 From ba4d2e3617f30c9611d00b116b649a92a3931187 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 11 May 2023 21:45:38 +0300 Subject: [PATCH 062/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 96e8ef2..1de4304 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 96e8ef2b2337e6c1f285506665e87c1607a66465 +Subproject commit 1de4304e3075f2880f547c46d6130baf408f1ea0 From e0ab62553610a78874ee01407631e723771e66eb Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 18 May 2023 12:59:42 +0300 Subject: [PATCH 063/266] qad, qglengine --- qad | 2 +- qglengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qad b/qad index f37a8e6..21f0f67 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit f37a8e6d933de54c163ae86eaf93a4a4f50edcdf +Subproject commit 21f0f67fdfe570fa2a17073e0ec2df7019b1a216 diff --git a/qglengine b/qglengine index c275d00..893910c 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit c275d006d5e58f4a7648ceca3049dd0099a24804 +Subproject commit 893910c43112a0e561d472a26bbe47877b7f6b72 From fb15cd6fa8a6bd81f45ffa0b42959766e48a57ab Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 23 May 2023 22:22:43 +0300 Subject: [PATCH 064/266] qglengine --- qglengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qglengine b/qglengine index 893910c..fcc1e98 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 893910c43112a0e561d472a26bbe47877b7f6b72 +Subproject commit fcc1e98a6e8f313fe92a2db2ce1f758f92698a7e From f53bd4d6670e80029b8a224f76feeda062ad46b2 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 24 May 2023 22:15:51 +0300 Subject: [PATCH 065/266] pip, qad, qglengine --- pip | 2 +- qad | 2 +- qglengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip b/pip index 1de4304..0ae63fa 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 1de4304e3075f2880f547c46d6130baf408f1ea0 +Subproject commit 0ae63fa9ad1e9a0d876307da11c0375cab8be153 diff --git a/qad b/qad index 21f0f67..ed9d000 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 21f0f67fdfe570fa2a17073e0ec2df7019b1a216 +Subproject commit ed9d0002f01a1d9f552d199a6cbca90870e77a62 diff --git a/qglengine b/qglengine index fcc1e98..85bc739 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit fcc1e98a6e8f313fe92a2db2ce1f758f92698a7e +Subproject commit 85bc739987066ae70db14adb9ce2da633af8b598 From 6a1bcf13f5b089ce84d31d7f8cf40229d100435c Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 5 Jun 2023 23:26:43 +0300 Subject: [PATCH 066/266] qglengine qad --- qad | 2 +- qglengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qad b/qad index ed9d000..7ce2b31 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit ed9d0002f01a1d9f552d199a6cbca90870e77a62 +Subproject commit 7ce2b31ec9b78a39d84de1276e6bd0efc9d0e647 diff --git a/qglengine b/qglengine index 85bc739..dfc4c71 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 85bc739987066ae70db14adb9ce2da633af8b598 +Subproject commit dfc4c718e8870d4630ac534781f9d7105a00846f From 6913efdf9d28b3c0dff8985b540d3aa4cbd632cb Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 15 Jun 2023 12:34:44 +0300 Subject: [PATCH 067/266] pip,qad,readme --- README.md | 8 ++++---- pip | 2 +- qad | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cbe91b8..15babe7 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ This repo can be compiled with GCC/MinGW/Clang, for Qt 4/5. If there is no Qt found, builds only PIP and CD. CMake options: -* **LOCAL** - if 0 then install to system directories: MinGW on Windows, /usr/local on Linux/MacOS, ${ANDROID_SYSTEM_LIBRARY_PATH} on Android. If 1 then install to ${CMAKE_INSTALL_PREFIX}. Disabled by default +* **LOCAL** - if 0 then install to system directories: MinGW on Windows, /usr/local on Linux/MacOS, ANDROID_SYSTEM_LIBRARY_PATH on Android. If 1 then install to CMAKE_INSTALL_PREFIX. Disabled by default * **UTILS** - build or not executable utilites, enabled by default * **DESIGNER_PLUGINS** - build or not Qt Designer plugins, enabled by default * **QGLVIEW** - build or not QGLView, disabled by default @@ -71,11 +71,11 @@ Build steps: 3. Download and install cmake from https://cmake.org/download/ 4. Prepare environment for x86 or amd64 architecture: - set prefix for mingw e.g.: for C:\mingw\8_1_x32\ or C:\mingw\8_1_x64\ - set SDK_MINGW_DIR=C:\mingw\8_1_x + set `SDK_MINGW_DIR=C:\mingw\8_1_x` - set prefix for Qt5 e.g.: for C:\qt\qt5150_win32\ or C:\qt\qt5150_win64\ - set SDK_QT5_DIR=C:\qt\qt5150_win + set `K_QT5_DIR=C:\qt\qt5150_win` - set path to cmake directory - set SDK_CMAKE_DIR=C:\cmake or C:\Program Files\CMake + set `SDK_CMAKE_DIR=C:\cmake` or `C:\Program Files\CMake` 5. Run `make_shstk32.bat` or `make_shstk64.bat` Build steps for both architectures: follow previous steps, but on '5' state run `make_shstk_all.bat` diff --git a/pip b/pip index 0ae63fa..dd56b1c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 0ae63fa9ad1e9a0d876307da11c0375cab8be153 +Subproject commit dd56b1c142c87488c49107f4eb3586ba735a180e diff --git a/qad b/qad index 7ce2b31..024360d 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 7ce2b31ec9b78a39d84de1276e6bd0efc9d0e647 +Subproject commit 024360dec5dd99061b6d1b30a40b461b73459e33 From ae7eb04e1e31c47cddd3c4de4262e850cf50f199 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 15 Jun 2023 12:35:35 +0300 Subject: [PATCH 068/266] README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 15babe7..69ccf6f 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Build steps: - set prefix for mingw e.g.: for C:\mingw\8_1_x32\ or C:\mingw\8_1_x64\ set `SDK_MINGW_DIR=C:\mingw\8_1_x` - set prefix for Qt5 e.g.: for C:\qt\qt5150_win32\ or C:\qt\qt5150_win64\ - set `K_QT5_DIR=C:\qt\qt5150_win` + set `SDK_QT5_DIR=C:\qt\qt5150_win` - set path to cmake directory set `SDK_CMAKE_DIR=C:\cmake` or `C:\Program Files\CMake` 5. Run `make_shstk32.bat` or `make_shstk64.bat` From a9f01a4c20e63df989f1e24d9026b519393360dd Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 15 Jun 2023 12:38:17 +0300 Subject: [PATCH 069/266] README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 69ccf6f..31fa360 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ After successfully install, you can use next CMake imported targets: * QAD::Application * QAD::Blockview * QAD::Graphic - widget for realtime visualization and publication quality 1D/2D plots + * QAD::SQL - wrapper around QtSqlQuery for code amount reduce * QAD::SQLTable - widget for display and edit data based on SQL tables with relations * QAD::TouchWidgets - collection of widgets for touch screen interface * QAD::Doc - markdown helper for qt From 9c34ee2b7e4868da78767a6f34fdd7b3b6c84c4b Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 2 Jul 2023 14:03:53 +0300 Subject: [PATCH 070/266] pip --- .gitignore | 1 + pip | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2b2ef11..48a9424 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ CMakeLists.txt.user* /release /build +/*_build_* diff --git a/pip b/pip index dd56b1c..ccae1a7 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit dd56b1c142c87488c49107f4eb3586ba735a180e +Subproject commit ccae1a73111f54450c937a1eb2e3cdaba4880241 From a477ed4d0c18b87f6425aa1405b3a618d6b903f5 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 2 Jul 2023 14:10:31 +0300 Subject: [PATCH 071/266] qglengine --- qglengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qglengine b/qglengine index dfc4c71..9c78ba5 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit dfc4c718e8870d4630ac534781f9d7105a00846f +Subproject commit 9c78ba52816b854f1e4999248bc664aba9ccc523 From 7c06efcff8ae2dad3f583bfeec7b7bab53d9ac0a Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 2 Jul 2023 14:13:05 +0300 Subject: [PATCH 072/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ccae1a7..9e78546 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ccae1a73111f54450c937a1eb2e3cdaba4880241 +Subproject commit 9e78546b7ee7d20dbbaaa67f83fc04957739a18a From f445c42a846085e75e5d300e41b7a6af8422ef2e Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 6 Jul 2023 20:10:24 +0300 Subject: [PATCH 073/266] cd,pip,qad --- cd | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cd b/cd index f4be39d..472591f 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit f4be39d4615375631c156c51136ab5ea0887808e +Subproject commit 472591fbf8ad7268360705910d83ca48aba1e1e2 diff --git a/pip b/pip index 9e78546..b763f0e 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9e78546b7ee7d20dbbaaa67f83fc04957739a18a +Subproject commit b763f0e5cd7b3e1c9f489016e6d5ad764e9bf26c diff --git a/qad b/qad index 024360d..a7469b5 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 024360dec5dd99061b6d1b30a40b461b73459e33 +Subproject commit a7469b5f191a2038898db56580ec075e8b57593f From 8fde465c8ebb8a9a8785ddc06ff3aaf68ef7f342 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 6 Jul 2023 21:48:48 +0300 Subject: [PATCH 074/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index b763f0e..b19d50b 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b763f0e5cd7b3e1c9f489016e6d5ad764e9bf26c +Subproject commit b19d50ba62968a6e202223307b44bc2fa67af0b2 From 9f516fadd8cb669a595f4f206f3342a697a415f1 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 6 Jul 2023 21:57:45 +0300 Subject: [PATCH 075/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index b19d50b..13ececf 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b19d50ba62968a6e202223307b44bc2fa67af0b2 +Subproject commit 13ececf370fc2f2a5d6bd7b0233b5538abf767f7 From 9c777977d80a1aff2f50c1770bb00791df9ae249 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 6 Jul 2023 22:36:01 +0300 Subject: [PATCH 076/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 13ececf..2f82aaf 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 13ececf370fc2f2a5d6bd7b0233b5538abf767f7 +Subproject commit 2f82aaf97bb0333278672d1d5e582d229034e4fa From 55efa7a712a40f01777ef64b5c0e8436950b4949 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 7 Jul 2023 11:51:14 +0300 Subject: [PATCH 077/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 2f82aaf..4d395f4 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 2f82aaf97bb0333278672d1d5e582d229034e4fa +Subproject commit 4d395f448767b0de21319760bab7151950839832 From 9055dd1c959409229ba4645c167d645cbf454a31 Mon Sep 17 00:00:00 2001 From: Andrey Bychkov Date: Thu, 13 Jul 2023 23:42:33 +0300 Subject: [PATCH 078/266] update pip and qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 4d395f4..63321a4 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 4d395f448767b0de21319760bab7151950839832 +Subproject commit 63321a4ce343e6f2694893b317f6a33d0955ed22 diff --git a/qad b/qad index a7469b5..4a927b5 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit a7469b5f191a2038898db56580ec075e8b57593f +Subproject commit 4a927b524eb54d3df9ac1dd155baa275f355cb14 From dc8a5c6f286e87f019e5a0894d6f59cec54fd6bd Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 14 Jul 2023 10:51:33 +0300 Subject: [PATCH 079/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 63321a4..56aed70 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 63321a4ce343e6f2694893b317f6a33d0955ed22 +Subproject commit 56aed70425dea21bbef3a499e98a0101ad265837 From 4ffd5fec6f423ab82f57a343805aa09fcac0dafe Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 14 Jul 2023 13:37:38 +0300 Subject: [PATCH 080/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 4a927b5..2a063a4 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 4a927b524eb54d3df9ac1dd155baa275f355cb14 +Subproject commit 2a063a4f00379a63cd0c137add07c75c7ddc5eb2 From 76ae9df13923838a0558b49c40b1fc8f8563d40e Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 14 Jul 2023 22:14:15 +0300 Subject: [PATCH 081/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 56aed70..ac76e07 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 56aed70425dea21bbef3a499e98a0101ad265837 +Subproject commit ac76e07d9d991ad22d48c6e641a4510a7d8a85cb From a7115fb6e126fdb58c13f8681055fe44e5312d70 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 2 Aug 2023 12:32:26 +0300 Subject: [PATCH 082/266] qad, qglengine --- qad | 2 +- qglengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qad b/qad index 2a063a4..1b06de0 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 2a063a4f00379a63cd0c137add07c75c7ddc5eb2 +Subproject commit 1b06de0dc4f250d68303748409bc4130c9b044bf diff --git a/qglengine b/qglengine index 9c78ba5..c3bb81f 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 9c78ba52816b854f1e4999248bc664aba9ccc523 +Subproject commit c3bb81f72d66ae8aad57b4d0da7f948e8572cb31 From f85e27bae9eef23e25414b429ece535316ab23da Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 14 Aug 2023 13:55:02 +0300 Subject: [PATCH 083/266] pip, qad, qglengine --- pip | 2 +- qad | 2 +- qglengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip b/pip index ac76e07..c86ec0a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ac76e07d9d991ad22d48c6e641a4510a7d8a85cb +Subproject commit c86ec0ae82a70e57e95e9267c91f987504624582 diff --git a/qad b/qad index 1b06de0..72cc874 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 1b06de0dc4f250d68303748409bc4130c9b044bf +Subproject commit 72cc874d8690172393f7339433fbb65d67c17a32 diff --git a/qglengine b/qglengine index c3bb81f..ef764d9 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit c3bb81f72d66ae8aad57b4d0da7f948e8572cb31 +Subproject commit ef764d947dae261195925d4d202a83f1165bc698 From 2d7a9e33ceff5a168cac9f38a96099e08d86c132 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 21 Aug 2023 19:51:45 +0300 Subject: [PATCH 084/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 72cc874..ca6bcd4 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 72cc874d8690172393f7339433fbb65d67c17a32 +Subproject commit ca6bcd4944f11b7fde5d198792278ab6233aadc1 From 9cb554d37b83ea49171887ac44d041e30d8e5b24 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 23 Aug 2023 16:34:17 +0300 Subject: [PATCH 085/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index ca6bcd4..b77648a 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit ca6bcd4944f11b7fde5d198792278ab6233aadc1 +Subproject commit b77648aae90273852fc9c0c78e800d4832ef0d48 From c3cb557e2d7888aa2dca2ed0af848262a1977db3 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 5 Sep 2023 20:17:08 +0300 Subject: [PATCH 086/266] pip, qad, qglengine --- pip | 2 +- qad | 2 +- qglengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip b/pip index c86ec0a..12b136a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit c86ec0ae82a70e57e95e9267c91f987504624582 +Subproject commit 12b136a2f46e55659ae90ff7351c7245ec41d295 diff --git a/qad b/qad index b77648a..fd26c53 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit b77648aae90273852fc9c0c78e800d4832ef0d48 +Subproject commit fd26c53fd26c6ad6b44d405f444aa8456c165941 diff --git a/qglengine b/qglengine index ef764d9..1ed6f12 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit ef764d947dae261195925d4d202a83f1165bc698 +Subproject commit 1ed6f12498aaedb73667cd5f2a44803fe1aec8ec From 234a0af9d8440610ca1e2778aea5cbfaa02ce167 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 6 Sep 2023 20:27:51 +0300 Subject: [PATCH 087/266] pip, qglengine --- pip | 2 +- qglengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 12b136a..d1662d3 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 12b136a2f46e55659ae90ff7351c7245ec41d295 +Subproject commit d1662d353508f441635ec8de6646b011e448cfdf diff --git a/qglengine b/qglengine index 1ed6f12..0baee2f 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 1ed6f12498aaedb73667cd5f2a44803fe1aec8ec +Subproject commit 0baee2f54c4bffea38c2af6290b8f3be7a637ecd From 451de9886a2ebf01a0381b8c714e75b959831893 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 6 Sep 2023 20:29:50 +0300 Subject: [PATCH 088/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index fd26c53..ac2bf45 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit fd26c53fd26c6ad6b44d405f444aa8456c165941 +Subproject commit ac2bf4567f0da991c8759e63f58bbaaa88845dd9 From 8bc32155627f779c4f28a214e41d386817dad584 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 6 Sep 2023 20:50:21 +0300 Subject: [PATCH 089/266] qgle --- qglengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qglengine b/qglengine index 0baee2f..2156e1d 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 0baee2f54c4bffea38c2af6290b8f3be7a637ecd +Subproject commit 2156e1d3e9ebd77f472facad31fdf5e13dd92e18 From 92da3c9584494e6d44b76e80952dff6e6ab9dfa0 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 7 Sep 2023 11:43:35 +0300 Subject: [PATCH 090/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index ac2bf45..c23c870 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit ac2bf4567f0da991c8759e63f58bbaaa88845dd9 +Subproject commit c23c8703a4e797fae1e66e548cb4c71265f96648 From aaf4367c0b92b7d328b8f99cc2629f429c86c0a5 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 7 Sep 2023 13:11:32 +0300 Subject: [PATCH 091/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index d1662d3..bb668da 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit d1662d353508f441635ec8de6646b011e448cfdf +Subproject commit bb668dab293d206073616ccd2546df2651637b0a From 80fac03bd1976467b1edd16aa0b5f9477b5216bd Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 7 Sep 2023 16:48:07 +0300 Subject: [PATCH 092/266] add linux_cross-shstk --- docker/linux_cross-shstk/Dockerfile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 docker/linux_cross-shstk/Dockerfile diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile new file mode 100644 index 0000000..3bf0e1a --- /dev/null +++ b/docker/linux_cross-shstk/Dockerfile @@ -0,0 +1,24 @@ +ARG DOCKER_PREFIX=wapmobil/ +ARG IMAGE_FROM +FROM ${DOCKER_PREFIX}${IMAGE_FROM} + +ARG LIBS_BUILD_NUMBER=9999 +ARG JOBS_COUNT=4 +ENV PATH=/opt/cmake/bin:$PATH + +WORKDIR /soft +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git + +WORKDIR /soft/shstk_build_host +RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ + && cmake --build ./ --target install -j${JOBS_COUNT} \ + && rm -rf * \ + && ldconfig + +WORKDIR /soft/shstk_build +RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \ + && cmake --build ./ --target install -j${JOBS_COUNT} \ + && cmake --build ./ --target deploy -j${JOBS_COUNT} \ + && rm -rf * + +WORKDIR /soft/src From 7cc8b3cb75290f9deb061dbf907017b13609b842 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 7 Sep 2023 16:51:27 +0300 Subject: [PATCH 093/266] cmake --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 43a9d8b..6c0de52 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 43a9d8be6f3c769065242e51aa28db9a4b9426b2 +Subproject commit 6c0de521801a3f5e2707cb8e36e132f1ca7568d7 From b374d5ab1a09fb7b7eb8eee960a620b61e928983 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 13 Sep 2023 10:34:06 +0300 Subject: [PATCH 094/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index bb668da..aa78e93 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit bb668dab293d206073616ccd2546df2651637b0a +Subproject commit aa78e930bed57857c27eef09f1b81dd3be641e83 diff --git a/qad b/qad index c23c870..1a2f5ce 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit c23c8703a4e797fae1e66e548cb4c71265f96648 +Subproject commit 1a2f5ceefcf73f10fbd0b098cd77031eb8ac52f6 From 5f72c4c6e6a272cad1d4a4e52508826bdf3dd99e Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 24 Sep 2023 15:16:51 +0300 Subject: [PATCH 095/266] qad, Jenkinsfile --- Jenkinsfile | 13 ++++++++----- qad | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a5fd3af..c78b1fa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,15 +1,18 @@ @Library('SHS.Platforms') _ -def build_docker(docker_image, docker_dir, release_dir) { - def image_name = "${docker_image}-shstk" +def build_docker(dist, release_dir) { + def image_name = "${dist.docker_image}-shstk" echo "Build image ${image_name}" def args = "" + for (arg in dist.docker_build_options) { + args += " --build-arg ${arg.key}=\"${arg.value}\"" + } if (env.DOCKER_PREFIX) { args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" } - args += " --build-arg IMAGE_FROM=${docker_image}" + args += " --build-arg IMAGE_FROM=${dist.docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" - def shstk_docker = docker.build("${image_name}", "./docker/${docker_dir}-shstk --no-cache ${args}") + def shstk_docker = docker.build("${image_name}", "./docker/${dist.docker_dir}-shstk --no-cache ${args}") shstk_docker.inside("-v " + release_dir + ":/soft/release") { sh 'cp -vf /soft/shstk/release/* /soft/release/ || true' } @@ -31,7 +34,7 @@ node { def _msg = "Built images:" pl.forEach ({ dist -> - _msg += build_docker(dist.docker_image, dist.docker_dir, rel_dir) + _msg += build_docker(dist, rel_dir) }, stageSuffix: "-shstk") stage("Clean") { diff --git a/qad b/qad index 1a2f5ce..5b5a374 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 1a2f5ceefcf73f10fbd0b098cd77031eb8ac52f6 +Subproject commit 5b5a3743500b1521a20c32a48d2e0aa392c8222b From 8caaf0f259df34415057e8e0300ffdf9bc321821 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 24 Sep 2023 15:19:39 +0300 Subject: [PATCH 096/266] support_gl --- docker/linux_cross-shstk/Dockerfile | 3 ++- docker/linux_desktop-shstk/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile index 3bf0e1a..a3df0be 100644 --- a/docker/linux_cross-shstk/Dockerfile +++ b/docker/linux_cross-shstk/Dockerfile @@ -4,6 +4,7 @@ FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 +ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft @@ -16,7 +17,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} .. && ldconfig WORKDIR /soft/shstk_build -RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \ +RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ && rm -rf * diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index f79a981..d6e5acb 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -4,13 +4,14 @@ FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 +ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git WORKDIR /soft/shstk_build_linux -RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ +RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && ldconfig \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ From b25c2e511c3d8d97a20533ff2d9f34a9c2dabc68 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 25 Sep 2023 14:35:36 +0300 Subject: [PATCH 097/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index aa78e93..61e6edb 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit aa78e930bed57857c27eef09f1b81dd3be641e83 +Subproject commit 61e6edb4c8b4443d6fb8c59c54453de583af54f3 From 739433800ade00690089e5ab4a24f471cc8a018e Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 8 Oct 2023 10:39:18 +0300 Subject: [PATCH 098/266] submodules relative path --- .gitmodules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index e7b4341..9921d0f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,20 +1,20 @@ [submodule "cmake"] path = cmake - url = https://git.shs.tools/SHS/cmake.git + url = ../cmake.git branch = master [submodule "qad"] path = qad - url = https://git.shs.tools/SHS/qad.git + url = ../qad.git branch = master [submodule "qglengine"] path = qglengine - url = https://git.shs.tools/SHS/qglengine.git + url = ../qglengine.git branch = master [submodule "pip"] path = pip - url = https://git.shs.tools/SHS/pip.git + url = ../pip.git branch = master [submodule "cd"] path = cd - url = https://git.shs.tools/SHS/cd.git + url = ../cd.git branch = master From 08e754fc917f9ad85be7f19edab28bca24594cb6 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 24 Oct 2023 13:13:33 +0300 Subject: [PATCH 099/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 5b5a374..0cf8136 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 5b5a3743500b1521a20c32a48d2e0aa392c8222b +Subproject commit 0cf81367575778ad88a5aaea7d04597431eca6c4 From 7d07114d25b6e3ef4155d8f7e9bb3b7dfa7e3b16 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 24 Oct 2023 15:37:50 +0300 Subject: [PATCH 100/266] docker gl fix --- docker/linux_desktop-shstk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index d6e5acb..35ee6ed 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -11,7 +11,7 @@ WORKDIR /soft RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git WORKDIR /soft/shstk_build_linux -RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ +RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && ldconfig \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ From d36647c2cfd2ed1d310f59d416fcf77723deb8cf Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 29 Oct 2023 20:03:56 +0300 Subject: [PATCH 101/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 0cf8136..4aa4c56 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 0cf81367575778ad88a5aaea7d04597431eca6c4 +Subproject commit 4aa4c56a3542d330089ffc7582825ef6f0be3f1e From 4356475c7fc3efdecb919cb26b311a78f3adc80b Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 29 Oct 2023 20:04:59 +0300 Subject: [PATCH 102/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 4aa4c56..c73be2a 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 4aa4c56a3542d330089ffc7582825ef6f0be3f1e +Subproject commit c73be2a29c6259175b6a3cf5665049b2326f8ca5 From 70ba5fdd32fb51519df4d273330a6f6a689f6c8b Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 9 Nov 2023 00:36:24 +0300 Subject: [PATCH 103/266] 4 subs --- cmake | 2 +- pip | 2 +- qad | 2 +- qglengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake b/cmake index 6c0de52..c816ddc 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 6c0de521801a3f5e2707cb8e36e132f1ca7568d7 +Subproject commit c816ddc21ef504d6d1aa59df0c844fe0c4ce313c diff --git a/pip b/pip index 61e6edb..03bd23a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 61e6edb4c8b4443d6fb8c59c54453de583af54f3 +Subproject commit 03bd23a3b9b5dce22c55101b823f336cabc075df diff --git a/qad b/qad index c73be2a..9f3a54b 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit c73be2a29c6259175b6a3cf5665049b2326f8ca5 +Subproject commit 9f3a54bbb9e314f20867fa5e980b796d17b356a2 diff --git a/qglengine b/qglengine index 2156e1d..5de0f62 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 2156e1d3e9ebd77f472facad31fdf5e13dd92e18 +Subproject commit 5de0f6234d3178561fbddc0c94db239065b477cc From 5fbc1db30452880bf3961f345c192fe0a4f836a7 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 9 Nov 2023 00:38:31 +0300 Subject: [PATCH 104/266] qglengine --- qglengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qglengine b/qglengine index 5de0f62..9d119f5 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 5de0f6234d3178561fbddc0c94db239065b477cc +Subproject commit 9d119f5c97f9c48e7e82c2ac257f1b8754c28195 From 5524cb5f169177c8cc707b768f496926a0f97a36 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 11 Nov 2023 23:01:37 +0300 Subject: [PATCH 105/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 9f3a54b..d200dbd 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 9f3a54bbb9e314f20867fa5e980b796d17b356a2 +Subproject commit d200dbdab5dcebec41f2c0f2906c1be88c6f0d31 From a8b4e3eaa3247e7a8a8141af2ba0865f0f9e3d10 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 20 Nov 2023 21:19:36 +0300 Subject: [PATCH 106/266] pip,qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 03bd23a..76c76b4 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 03bd23a3b9b5dce22c55101b823f336cabc075df +Subproject commit 76c76b48c58a6b9dcb37c0ede27e0969bf3e9887 diff --git a/qad b/qad index d200dbd..dcbb01a 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit d200dbdab5dcebec41f2c0f2906c1be88c6f0d31 +Subproject commit dcbb01ae25ec9b22d892f18fbb4b5bc57cd77d1f From 124db207111b7e17fc6a2bbe19aab659ca8241db Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 20 Nov 2023 23:34:01 +0300 Subject: [PATCH 107/266] cmake, pip --- cmake | 2 +- pip | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake b/cmake index c816ddc..9fe2044 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit c816ddc21ef504d6d1aa59df0c844fe0c4ce313c +Subproject commit 9fe2044e8f1fe9b09dfa272390c763e7dbca6fc3 diff --git a/pip b/pip index 76c76b4..49a5ed6 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 76c76b48c58a6b9dcb37c0ede27e0969bf3e9887 +Subproject commit 49a5ed6aa3592beeafc580f6b72fd3c956544497 From 5221ffede5559a0c42af7b4fec93c79ef1bf4e15 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 8 Dec 2023 16:14:49 +0300 Subject: [PATCH 108/266] pip 3.15.0 --- pip | 2 +- qad | 2 +- qglengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip b/pip index 49a5ed6..b8fc447 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 49a5ed6aa3592beeafc580f6b72fd3c956544497 +Subproject commit b8fc44714c93230b2205acf3e234cb486827360c diff --git a/qad b/qad index dcbb01a..dd78bb0 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit dcbb01ae25ec9b22d892f18fbb4b5bc57cd77d1f +Subproject commit dd78bb09eb1fe2be4cac101c24d2ca957caf4480 diff --git a/qglengine b/qglengine index 9d119f5..553e24b 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 9d119f5c97f9c48e7e82c2ac257f1b8754c28195 +Subproject commit 553e24b8960ef0a4d86c564632533ce27596d0b2 From 1fa570e5aa91984e3d41fa2dd6d3159e7ea6fb9e Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 8 Dec 2023 19:02:01 +0300 Subject: [PATCH 109/266] PICODEINFO:: changed --- pip | 2 +- qad | 2 +- qglengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip b/pip index b8fc447..c77afcc 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b8fc44714c93230b2205acf3e234cb486827360c +Subproject commit c77afcc37449560e112e158671528402347fc2b2 diff --git a/qad b/qad index dd78bb0..504abae 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit dd78bb09eb1fe2be4cac101c24d2ca957caf4480 +Subproject commit 504abae44018ff3d5b4c2a1d2e29dce759371997 diff --git a/qglengine b/qglengine index 553e24b..c642ec6 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 553e24b8960ef0a4d86c564632533ce27596d0b2 +Subproject commit c642ec603fdd306a578c56ba026a03c1c69a774e From af62a83bec2db01c578ede067ac825cc3a3ffa1d Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 9 Dec 2023 07:19:34 +0300 Subject: [PATCH 110/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index c77afcc..7efdacc 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit c77afcc37449560e112e158671528402347fc2b2 +Subproject commit 7efdacc9799a2ca7d8c5e09770792b50d9060d68 From 26059ef86e3c1e868d9d5faae5e3c395bacd4c85 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 9 Dec 2023 07:32:22 +0300 Subject: [PATCH 111/266] doc --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 7efdacc..c8350d2 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 7efdacc9799a2ca7d8c5e09770792b50d9060d68 +Subproject commit c8350d2f0ab11975d6e5bc601c7a8e2c093c2f8f From dc8e03c84ef74e0e2b4cb393dcf006ccb31f8a2c Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 12 Dec 2023 22:05:18 +0300 Subject: [PATCH 112/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index c8350d2..d299a1f 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit c8350d2f0ab11975d6e5bc601c7a8e2c093c2f8f +Subproject commit d299a1f3860da1c4053ad0438e379d8f50bdbe14 From 1f1e016c380e8ce3de82273ffd59a17c2fe7da60 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 14 Dec 2023 11:19:15 +0300 Subject: [PATCH 113/266] cmake --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 9fe2044..0183fb7 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9fe2044e8f1fe9b09dfa272390c763e7dbca6fc3 +Subproject commit 0183fb79b06046250c8bd7074a8707a28101d638 From 73d5742958b3a4906ccbe0bc879b2551efd1f4d7 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 24 Dec 2023 22:46:28 +0300 Subject: [PATCH 114/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 504abae..e2a91a4 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 504abae44018ff3d5b4c2a1d2e29dce759371997 +Subproject commit e2a91a4fbd4ce87584439195ba11175ed4eb3a8e From a7ea19a2e7e392fca657328b82abf27c47eb31d6 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 16 Jan 2024 14:05:56 +0300 Subject: [PATCH 115/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index e2a91a4..7a669d4 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit e2a91a4fbd4ce87584439195ba11175ed4eb3a8e +Subproject commit 7a669d47c800ca04e41245ca179e5eb8ddab53a2 From 5341e2dc4df8cbb3e1987931f354e056281a172d Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 16 Jan 2024 15:05:57 +0300 Subject: [PATCH 116/266] cmake --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 0183fb7..898d354 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 0183fb79b06046250c8bd7074a8707a28101d638 +Subproject commit 898d3540cf5082086d45f420154777b5735dacc2 From fb4366377ee08bf44e5f309a4d7dc941c494b933 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 18 Jan 2024 16:09:29 +0300 Subject: [PATCH 117/266] pip,qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index d299a1f..3652705 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit d299a1f3860da1c4053ad0438e379d8f50bdbe14 +Subproject commit 3652705784ecb2d4602e958cfd1c45b40bece2db diff --git a/qad b/qad index 7a669d4..b9dea57 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 7a669d47c800ca04e41245ca179e5eb8ddab53a2 +Subproject commit b9dea57200502bf04ee4ac72ceb263d404f2e60e From c50c829bc8db10f2b86683a588668a88824ec0e2 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 18 Jan 2024 18:41:01 +0300 Subject: [PATCH 118/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index b9dea57..6a67442 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit b9dea57200502bf04ee4ac72ceb263d404f2e60e +Subproject commit 6a67442d21323b01f58d4fecf7a595b7ae77229a From 72ece09fa2ea134c7a9e9e21b8c3837c46486c24 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 18 Jan 2024 18:41:37 +0300 Subject: [PATCH 119/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 6a67442..b340dfe 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 6a67442d21323b01f58d4fecf7a595b7ae77229a +Subproject commit b340dfebacce0b988c816cd5717ee7b763ad5545 From c1d927b6c82d801165525ea3612c67de95967da5 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 19 Jan 2024 15:20:38 +0300 Subject: [PATCH 120/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index b340dfe..4c7b944 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit b340dfebacce0b988c816cd5717ee7b763ad5545 +Subproject commit 4c7b9444b6a2a2664218f8d97f54adc2b44f535a From 54744d41b98493192dc3cd57127944b9b803e1d7 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 25 Jan 2024 23:59:06 +0300 Subject: [PATCH 121/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 3652705..7297b9a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 3652705784ecb2d4602e958cfd1c45b40bece2db +Subproject commit 7297b9aee03346e37e42196df8985774d02d7c82 From a5bc894ba09a6f93618906aeb19a71ed8d162954 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 22 Feb 2024 17:13:08 +0300 Subject: [PATCH 122/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 7297b9a..50bff12 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 7297b9aee03346e37e42196df8985774d02d7c82 +Subproject commit 50bff123642958ab9809f4f162d714f9c23ff5bc diff --git a/qad b/qad index 4c7b944..12f0603 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 4c7b9444b6a2a2664218f8d97f54adc2b44f535a +Subproject commit 12f0603413a24840a84e552dfd9c4e9678a372f7 From bbb50ae82577b9c614bad7315dd802ccad56a8c1 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 27 Feb 2024 14:43:44 +0300 Subject: [PATCH 123/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 12f0603..03f8452 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 12f0603413a24840a84e552dfd9c4e9678a372f7 +Subproject commit 03f845251236b1bc927cdb436fa05352c4e49447 From c1262de61d927c10ff1fbf7cf4102bd77f78b4d6 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 28 Feb 2024 10:30:44 +0300 Subject: [PATCH 124/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 50bff12..960e4a7 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 50bff123642958ab9809f4f162d714f9c23ff5bc +Subproject commit 960e4a7cce61ba1e09a9dfc848bf1cfc90f458b1 From 23e7061c01e637d67579ff94437d4340f5489c99 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 28 Feb 2024 10:40:07 +0300 Subject: [PATCH 125/266] migrate to shstk.ru --- docker/android-shstk/Dockerfile | 2 +- docker/linux_cross-shstk/Dockerfile | 2 +- docker/linux_desktop-shstk/Dockerfile | 2 +- docker/osx-shstk/Dockerfile | 2 +- docker/pi-shstk/Dockerfile | 2 +- docker/windows-shstk/Dockerfile | 2 +- docker/windows32-shstk/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/android-shstk/Dockerfile b/docker/android-shstk/Dockerfile index 6e93cfa..cb535f7 100644 --- a/docker/android-shstk/Dockerfile +++ b/docker/android-shstk/Dockerfile @@ -10,7 +10,7 @@ ENV ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake ENV NDK_PLATFORM="android-21" WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile index a3df0be..cc83f19 100644 --- a/docker/linux_cross-shstk/Dockerfile +++ b/docker/linux_cross-shstk/Dockerfile @@ -8,7 +8,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index 35ee6ed..b214846 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -8,7 +8,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/osx-shstk/Dockerfile b/docker/osx-shstk/Dockerfile index 89cae55..4e67335 100644 --- a/docker/osx-shstk/Dockerfile +++ b/docker/osx-shstk/Dockerfile @@ -6,7 +6,7 @@ ARG JOBS_COUNT=4 ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile index 946b26c..363b367 100644 --- a/docker/pi-shstk/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -6,7 +6,7 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/windows-shstk/Dockerfile b/docker/windows-shstk/Dockerfile index 187e8a6..e11e48f 100644 --- a/docker/windows-shstk/Dockerfile +++ b/docker/windows-shstk/Dockerfile @@ -6,7 +6,7 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile index 0c6291e..d454355 100644 --- a/docker/windows32-shstk/Dockerfile +++ b/docker/windows32-shstk/Dockerfile @@ -6,7 +6,7 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ From 2af1bc0f68fe11aff8da37d5c2628c6015231912 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 29 Feb 2024 13:38:01 +0300 Subject: [PATCH 126/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 960e4a7..154fb7d 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 960e4a7cce61ba1e09a9dfc848bf1cfc90f458b1 +Subproject commit 154fb7d9fd88ea9b25de374efd7c65ee949fa842 From 303fe9e0988537ed24f04f87ea6a0a4194c58a38 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 5 Mar 2024 19:41:20 +0300 Subject: [PATCH 127/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 154fb7d..263fa18 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 154fb7d9fd88ea9b25de374efd7c65ee949fa842 +Subproject commit 263fa187260f3b82d51944b92936aca6de60702d diff --git a/qad b/qad index 03f8452..50a231a 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 03f845251236b1bc927cdb436fa05352c4e49447 +Subproject commit 50a231a8e7cb2d1ddf87ac30c45fb1501e89957e From d4ec432a7eb321f63ba6a3ca3155638ca26bfa5b Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 10 Mar 2024 21:22:51 +0300 Subject: [PATCH 128/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 263fa18..2b738f6 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 263fa187260f3b82d51944b92936aca6de60702d +Subproject commit 2b738f6f4377b02735b4872d52c0ddaf67dff717 From 9b34741d3d74782f79b1d32d27ee9a5ed2c95858 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 13 Mar 2024 16:40:23 +0300 Subject: [PATCH 129/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 50a231a..dedd387 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 50a231a8e7cb2d1ddf87ac30c45fb1501e89957e +Subproject commit dedd38772ebe79722b2f4b4461293bf02407e523 From c1c78f060c7d8b6a7d0b7856896f67ee8c8e1d78 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Mar 2024 19:50:31 +0300 Subject: [PATCH 130/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 2b738f6..576d9c7 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 2b738f6f4377b02735b4872d52c0ddaf67dff717 +Subproject commit 576d9c79be438f610f4669690d0b6c1f31c6cdd8 From 14e4038c3328c01c5363038e2285c6a14b4f78a2 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 18 Mar 2024 10:46:03 +0300 Subject: [PATCH 131/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 576d9c7..dd6d91a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 576d9c79be438f610f4669690d0b6c1f31c6cdd8 +Subproject commit dd6d91ac1df02d1d438a7092b4bb5de503d03727 From 1c1a6f626ce2b77713cc9e62f30d4024bdefc44b Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 22 Mar 2024 21:40:16 +0300 Subject: [PATCH 132/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index dd6d91a..ad7385c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit dd6d91ac1df02d1d438a7092b4bb5de503d03727 +Subproject commit ad7385c21f2aa5e6e3251d199f4e319a656eab43 From 0bd8772271ab96f1d61c9192503c92fdf553cc1c Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 22 Mar 2024 22:29:21 +0300 Subject: [PATCH 133/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ad7385c..02a9bfb 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ad7385c21f2aa5e6e3251d199f4e319a656eab43 +Subproject commit 02a9bfb76f3acb57acad990d49d3e517876493ea From ccb83d627432ebac81078410d15af9bdce1c06a2 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 24 Mar 2024 20:23:29 +0300 Subject: [PATCH 134/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index dedd387..47420cf 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit dedd38772ebe79722b2f4b4461293bf02407e523 +Subproject commit 47420cf19a0a42381833adc7d10915a58a162285 From 1c33fba47035afb60d25e61fe062d7a5b56f8c69 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 24 Mar 2024 22:39:38 +0300 Subject: [PATCH 135/266] qad, cmake --- cmake | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake b/cmake index 898d354..7d53e93 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 898d3540cf5082086d45f420154777b5735dacc2 +Subproject commit 7d53e9379939a5bc07bb13f3f7b94bc6bd0119ec diff --git a/qad b/qad index 47420cf..592c17e 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 47420cf19a0a42381833adc7d10915a58a162285 +Subproject commit 592c17e1c77b9a261bea6cb8e37fd11013802d74 From e013aa0fdab39ec9d724cab123482e466c95bb2f Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 25 Mar 2024 21:17:13 +0300 Subject: [PATCH 136/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 02a9bfb..0d585cf 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 02a9bfb76f3acb57acad990d49d3e517876493ea +Subproject commit 0d585cfebf7ba6cde23662781cd79207cbdb55c4 From 3a4b62c6591a9039aad1d7e2d1245b1cd0ec9c1b Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 25 Mar 2024 21:24:35 +0300 Subject: [PATCH 137/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 0d585cf..2db9440 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 0d585cfebf7ba6cde23662781cd79207cbdb55c4 +Subproject commit 2db9440a38d212c2084b1a58954ca606029d8b45 From 301090c3c19fbdae8acdb6c825e64639cb3fdc5e Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 26 Mar 2024 10:35:24 +0300 Subject: [PATCH 138/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 2db9440..c7c3852 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 2db9440a38d212c2084b1a58954ca606029d8b45 +Subproject commit c7c3852747b74a20efd46bec7a2166bf5b3107bb diff --git a/qad b/qad index 592c17e..ab2c8d4 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 592c17e1c77b9a261bea6cb8e37fd11013802d74 +Subproject commit ab2c8d44805a96ce049eb92dbbd313dc55b30dc7 From ac104615dfabf42057261f17530ef3ee74cfc80c Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 29 Mar 2024 21:31:53 +0300 Subject: [PATCH 139/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index ab2c8d4..073d483 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit ab2c8d44805a96ce049eb92dbbd313dc55b30dc7 +Subproject commit 073d4833814576ec13831417ef663d5150cb7b72 From b59210fdda0d7eff8a8030515dd710a8e5d9f279 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 31 Mar 2024 20:38:21 +0300 Subject: [PATCH 140/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index c7c3852..eb21c85 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit c7c3852747b74a20efd46bec7a2166bf5b3107bb +Subproject commit eb21c85170a090e9854ada89b75460a85b0e6593 From 30af04ec98bc629baced6567bebd160ac1cf1d87 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 4 Apr 2024 12:34:07 +0300 Subject: [PATCH 141/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index eb21c85..ebf2b08 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit eb21c85170a090e9854ada89b75460a85b0e6593 +Subproject commit ebf2b08bb12d61b1f616e31d63e4395cda3d0dd1 From 584e6993d23b484452228ba2f813949a22331025 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 5 Apr 2024 15:34:51 +0300 Subject: [PATCH 142/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ebf2b08..9283c88 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ebf2b08bb12d61b1f616e31d63e4395cda3d0dd1 +Subproject commit 9283c88b4ee940e6a72d6f1e32cfad5bd6eb1b0c From 1f97f06b237f63f2185d6283f5879afa11ba05ba Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 5 Apr 2024 17:13:37 +0300 Subject: [PATCH 143/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 9283c88..ee4d78d 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9283c88b4ee940e6a72d6f1e32cfad5bd6eb1b0c +Subproject commit ee4d78d2e1037c6f843e4a071f95a8e8d4501fdc From f42908b8791bcf9843cb2158ae08225d99b0665d Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 5 Apr 2024 20:43:03 +0300 Subject: [PATCH 144/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ee4d78d..021411d 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ee4d78d2e1037c6f843e4a071f95a8e8d4501fdc +Subproject commit 021411defac37ea9bbca97badd3fd251a50aaa35 From b3389e7f1f9fe233f198f2d2e737ee705a22118b Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 5 Apr 2024 21:00:08 +0300 Subject: [PATCH 145/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 021411d..9f29155 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 021411defac37ea9bbca97badd3fd251a50aaa35 +Subproject commit 9f29155d0736e2291a88f0abe8508fb2617dfe6c From 7a59f3d5ffe164d0371c25b68156054735f8ef74 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 5 Apr 2024 21:02:44 +0300 Subject: [PATCH 146/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 9f29155..04d3e31 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9f29155d0736e2291a88f0abe8508fb2617dfe6c +Subproject commit 04d3e31dbcb2c7b99525b57a418a31ef87130cc7 From b0cd1a03d108b03734af5372e31ed41abaebaead Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 8 Apr 2024 11:25:55 +0300 Subject: [PATCH 147/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 073d483..bee9bd1 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 073d4833814576ec13831417ef663d5150cb7b72 +Subproject commit bee9bd12d508324047cca6bcd6d4b730364d028d From 315410c52db8f05c765c4534cf64b545b1efe61a Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 8 Apr 2024 21:23:16 +0300 Subject: [PATCH 148/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 04d3e31..1b67000 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 04d3e31dbcb2c7b99525b57a418a31ef87130cc7 +Subproject commit 1b67000887835b8c7c00c056d2849c5a270caec1 From b992164ccc8f7586077da66c9eb551162d1de874 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 9 Apr 2024 18:55:46 +0300 Subject: [PATCH 149/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index bee9bd1..c3ba093 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit bee9bd12d508324047cca6bcd6d4b730364d028d +Subproject commit c3ba09328b9b90d35fd58e693ac8d96f8f35914b From f45ef5f8dcd1bb5f3673392a74b0030efd2678be Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 10 Apr 2024 20:49:40 +0300 Subject: [PATCH 150/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 1b67000..a745f80 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 1b67000887835b8c7c00c056d2849c5a270caec1 +Subproject commit a745f803b34a64a70fe1abd228c03812217276f7 From 966c368181caca765dacba5a17c10e6015e7973d Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 18 Apr 2024 20:01:55 +0300 Subject: [PATCH 151/266] pip, qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index c3ba093..82f863d 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit c3ba09328b9b90d35fd58e693ac8d96f8f35914b +Subproject commit 82f863db47a7eb13f61f3bad2be3fead44553cd7 From 294a9441400eb1fb0a2247ffab9433943148583e Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 26 Apr 2024 15:38:09 +0300 Subject: [PATCH 152/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index a745f80..247759b 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit a745f803b34a64a70fe1abd228c03812217276f7 +Subproject commit 247759b364a4a7b685d71027bf7c5e5fef913539 diff --git a/qad b/qad index 82f863d..9966f2d 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 82f863db47a7eb13f61f3bad2be3fead44553cd7 +Subproject commit 9966f2d5e471e33e0849d88f76b074d52a9790b1 From 461467e6d1c6e751dae41e4cbf7c229da6236c89 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 30 Apr 2024 15:23:57 +0300 Subject: [PATCH 153/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 247759b..d97798d 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 247759b364a4a7b685d71027bf7c5e5fef913539 +Subproject commit d97798d063511e9d5b1a44aa1a7851547dcac117 diff --git a/qad b/qad index 9966f2d..144d247 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 9966f2d5e471e33e0849d88f76b074d52a9790b1 +Subproject commit 144d24711c4bc483c3eb54dc9f0e546da49c67bc From f4e146d0a0926d0f2dec0362a85ce5a374aa1f4c Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 2 May 2024 12:10:20 +0300 Subject: [PATCH 154/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 144d247..44839c7 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 144d24711c4bc483c3eb54dc9f0e546da49c67bc +Subproject commit 44839c740d1a8dd4691903d6764c64ccb10806dd From 9021169f17d3f0495caa4fbc609cfa5b694b3780 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 2 May 2024 12:26:41 +0300 Subject: [PATCH 155/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 44839c7..0dcc0da 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 44839c740d1a8dd4691903d6764c64ccb10806dd +Subproject commit 0dcc0da00432b92029619b176709e7e5e5232a6a From 6d9dd31516fd71e207a4f17067d142bf5ee99bca Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 2 May 2024 21:35:42 +0300 Subject: [PATCH 156/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index d97798d..a86e8f7 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit d97798d063511e9d5b1a44aa1a7851547dcac117 +Subproject commit a86e8f7b58353eefa33dc6ac4a6b556c1cbafa82 From 526d15a3e1694b97c7ca2ea63849699577e56a02 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 13 May 2024 22:29:47 +0300 Subject: [PATCH 157/266] pip,qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index a86e8f7..f97fed7 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit a86e8f7b58353eefa33dc6ac4a6b556c1cbafa82 +Subproject commit f97fed7daa9dc0d5e6b96a9292b088ba191917f6 diff --git a/qad b/qad index 0dcc0da..85adc66 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 0dcc0da00432b92029619b176709e7e5e5232a6a +Subproject commit 85adc666efac745623cf9e5eaba3bd65733c4b66 From 1c3499afc852078b4dc1145a4015b6cc4209abaa Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 14 May 2024 21:02:03 +0300 Subject: [PATCH 158/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index f97fed7..7eae1e1 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f97fed7daa9dc0d5e6b96a9292b088ba191917f6 +Subproject commit 7eae1e127cdf88a8ea37f18eec7f26eddec56d5b From e8743f0ae78f49fc254c54b6f848caae0edf81ea Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 22 May 2024 15:16:02 +0300 Subject: [PATCH 159/266] pip, add ondemand flag --- Jenkinsfile | 7 +++++-- docker/astra1.7-shstk/Dockerfile | 20 ++++++++++++++++++++ pip | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 docker/astra1.7-shstk/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index c78b1fa..df09ae2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,11 @@ node { def _msg = "Built images:" pl.forEach ({ dist -> - _msg += build_docker(dist, rel_dir) - }, stageSuffix: "-shstk") + _msg += build_docker(dist, rel_dir) + }, + stageSuffix: "-shstk", + ondemand: true + ) stage("Clean") { sh "docker system prune -f" diff --git a/docker/astra1.7-shstk/Dockerfile b/docker/astra1.7-shstk/Dockerfile new file mode 100644 index 0000000..b214846 --- /dev/null +++ b/docker/astra1.7-shstk/Dockerfile @@ -0,0 +1,20 @@ +ARG DOCKER_PREFIX=wapmobil/ +ARG IMAGE_FROM +FROM ${DOCKER_PREFIX}${IMAGE_FROM} + +ARG LIBS_BUILD_NUMBER=9999 +ARG JOBS_COUNT=4 +ARG support_gl=1 +ENV PATH=/opt/cmake/bin:$PATH + +WORKDIR /soft +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git + +WORKDIR /soft/shstk_build_linux +RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ + && cmake --build ./ --target install -j${JOBS_COUNT} \ + && ldconfig \ + && cmake --build ./ --target deploy -j${JOBS_COUNT} \ + && rm -rf * + +WORKDIR /soft/src diff --git a/pip b/pip index 7eae1e1..af4b718 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 7eae1e127cdf88a8ea37f18eec7f26eddec56d5b +Subproject commit af4b71805365fee8097ad32f930a984ededd473a From 6925b9ab2970de2885cb4da21a9e7a8e4698ccf5 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 29 May 2024 21:42:37 +0300 Subject: [PATCH 160/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 85adc66..ac0f5bc 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 85adc666efac745623cf9e5eaba3bd65733c4b66 +Subproject commit ac0f5bc32569327b0078ccce9b08b15960dab4a9 From 5cc82f2c0508f3ec746668f1e5f3d3eb3c7d0dce Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 1 Jun 2024 22:37:28 +0300 Subject: [PATCH 161/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index af4b718..d46b5e0 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit af4b71805365fee8097ad32f930a984ededd473a +Subproject commit d46b5e008ad474e2393876740e840275675936d8 diff --git a/qad b/qad index ac0f5bc..5bc7d7c 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit ac0f5bc32569327b0078ccce9b08b15960dab4a9 +Subproject commit 5bc7d7cf068885b6ee9fb43a16c4b51177bea62b From 50133c5e24743896c476b13a78f4c6d370f118f7 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 7 Jun 2024 00:20:47 +0300 Subject: [PATCH 162/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index d46b5e0..15dc76c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit d46b5e008ad474e2393876740e840275675936d8 +Subproject commit 15dc76c4a7383996ba19ec38f27f6f047199c059 From 79d843148b5fc0fd46549698fd365f5fdb284bed Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 7 Jun 2024 00:23:23 +0300 Subject: [PATCH 163/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 15dc76c..9cd0599 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 15dc76c4a7383996ba19ec38f27f6f047199c059 +Subproject commit 9cd05996e76865cbbd8c0d752e4ad44651033d19 From 1aa9c49a4a2a5aa58c56cc76184b925b073acce4 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 10 Jul 2024 13:02:13 +0300 Subject: [PATCH 164/266] pip,qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 9cd0599..a16e0b7 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9cd05996e76865cbbd8c0d752e4ad44651033d19 +Subproject commit a16e0b765981932b02d5a66ee1a635bb83285b73 diff --git a/qad b/qad index 5bc7d7c..083dc3e 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 5bc7d7cf068885b6ee9fb43a16c4b51177bea62b +Subproject commit 083dc3edf584bd008e1114f618707a0bc5788cc2 From 867fb27151e2dae6374bf24f58447b324e547ece Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 10 Jul 2024 16:56:48 +0300 Subject: [PATCH 165/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index a16e0b7..b781bd5 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit a16e0b765981932b02d5a66ee1a635bb83285b73 +Subproject commit b781bd514863fbf6a98487ea7a0b4be9ca672ae9 From 25c0322a4535d93d17b4c91a17750ab4e6c574ea Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 12 Jul 2024 12:30:29 +0300 Subject: [PATCH 166/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index b781bd5..f041d14 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b781bd514863fbf6a98487ea7a0b4be9ca672ae9 +Subproject commit f041d1435e6016b976635743b1e5f38b8458fe26 From bc976a9a2c8a469da2416031650074513672a8f8 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 30 Jul 2024 14:19:33 +0300 Subject: [PATCH 167/266] pip v4 --- cd | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cd b/cd index 472591f..4f00607 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 472591fbf8ad7268360705910d83ca48aba1e1e2 +Subproject commit 4f006072e8ec2841ec5224beb791627824cd7c24 diff --git a/pip b/pip index f041d14..1c7fc39 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f041d1435e6016b976635743b1e5f38b8458fe26 +Subproject commit 1c7fc39b6c7aa89109554c224658426330927a13 diff --git a/qad b/qad index 083dc3e..ab423e1 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 083dc3edf584bd008e1114f618707a0bc5788cc2 +Subproject commit ab423e15302dfc3c3a6650a99ef301909275ed9e From f4c82b048e522b1f657e6ebc40dd3040cfe6e0fb Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 30 Jul 2024 14:26:13 +0300 Subject: [PATCH 168/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 1c7fc39..a438c42 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 1c7fc39b6c7aa89109554c224658426330927a13 +Subproject commit a438c4249def78f48271333f82cadf65b9084dd3 From 79a5fd6e77f7069408cef38f207791d44bcf8475 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 30 Jul 2024 14:42:03 +0300 Subject: [PATCH 169/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index a438c42..ccf6b81 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit a438c4249def78f48271333f82cadf65b9084dd3 +Subproject commit ccf6b810b5125ac117a81d0f34fbe7742104c4d8 From c472e1ec78f3b932d75e5d925e47aaec887d6cf0 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 30 Jul 2024 14:48:07 +0300 Subject: [PATCH 170/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ccf6b81..f43f834 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ccf6b810b5125ac117a81d0f34fbe7742104c4d8 +Subproject commit f43f834460bc55d001936cfb7b7ec42bff23b8d0 From 7292b696c459889ca31d61681835794b39e7d1cb Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 30 Jul 2024 17:21:48 +0300 Subject: [PATCH 171/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index f43f834..c887680 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f43f834460bc55d001936cfb7b7ec42bff23b8d0 +Subproject commit c8876807ed20d301f1346a7070465b71bedd8bfa From 7adab30d29f479bdefb7fe36a9479be4398ef71a Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 2 Aug 2024 14:43:56 +0300 Subject: [PATCH 172/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index c887680..7d02f71 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit c8876807ed20d301f1346a7070465b71bedd8bfa +Subproject commit 7d02f710ea5d6176498fba61a6cd4939efa7eb90 From 373e48413427b018d219339305299fe731d9efe6 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 10 Aug 2024 14:13:30 +0300 Subject: [PATCH 173/266] add astra 1.8 --- docker/astra1.8-shstk/Dockerfile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docker/astra1.8-shstk/Dockerfile diff --git a/docker/astra1.8-shstk/Dockerfile b/docker/astra1.8-shstk/Dockerfile new file mode 100644 index 0000000..b214846 --- /dev/null +++ b/docker/astra1.8-shstk/Dockerfile @@ -0,0 +1,20 @@ +ARG DOCKER_PREFIX=wapmobil/ +ARG IMAGE_FROM +FROM ${DOCKER_PREFIX}${IMAGE_FROM} + +ARG LIBS_BUILD_NUMBER=9999 +ARG JOBS_COUNT=4 +ARG support_gl=1 +ENV PATH=/opt/cmake/bin:$PATH + +WORKDIR /soft +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git + +WORKDIR /soft/shstk_build_linux +RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ + && cmake --build ./ --target install -j${JOBS_COUNT} \ + && ldconfig \ + && cmake --build ./ --target deploy -j${JOBS_COUNT} \ + && rm -rf * + +WORKDIR /soft/src From b189fc4fb54744bbacbd1f540f253e3f4341363b Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 30 Aug 2024 18:15:53 +0300 Subject: [PATCH 174/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 7d02f71..a0454b8 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 7d02f710ea5d6176498fba61a6cd4939efa7eb90 +Subproject commit a0454b809d7eecab246ab6abbf4123069cfac111 From 8f09dc3b283b06e6899bbc7b16015fcd53f0f0e9 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 31 Aug 2024 22:19:34 +0300 Subject: [PATCH 175/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index ab423e1..2eacbfb 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit ab423e15302dfc3c3a6650a99ef301909275ed9e +Subproject commit 2eacbfbfc15ed8806d8e0dea290126fd38b5f60b From d8d953b8ebf61821209be66046d2cc674d051260 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 6 Sep 2024 08:05:37 +0300 Subject: [PATCH 176/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index a0454b8..16a818c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit a0454b809d7eecab246ab6abbf4123069cfac111 +Subproject commit 16a818c95eb72abeb9b4f07a774a1eb7bc59d811 From 41fcde99471cc72823b0720f3ed409a8c5f3f800 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 3 Oct 2024 12:43:46 +0300 Subject: [PATCH 177/266] pip, cd, qad --- cd | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cd b/cd index 4f00607..b6898b9 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 4f006072e8ec2841ec5224beb791627824cd7c24 +Subproject commit b6898b96f7c41e8577e08ab4206f93553b3dd659 diff --git a/pip b/pip index 16a818c..9eecbba 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 16a818c95eb72abeb9b4f07a774a1eb7bc59d811 +Subproject commit 9eecbbab6e63001e14c0c86942b2ef488e9ad85c diff --git a/qad b/qad index 2eacbfb..dd46957 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 2eacbfbfc15ed8806d8e0dea290126fd38b5f60b +Subproject commit dd4695780d9bc9214423bc04cb577a8ec9f3e975 From 9608e9f1e92224186c6ce954125106abcaf3a591 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 15 Oct 2024 15:05:48 +0300 Subject: [PATCH 178/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 9eecbba..92a87a0 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9eecbbab6e63001e14c0c86942b2ef488e9ad85c +Subproject commit 92a87a0c64f58a96227827b148cd3a79bc145e39 diff --git a/qad b/qad index dd46957..26a656a 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit dd4695780d9bc9214423bc04cb577a8ec9f3e975 +Subproject commit 26a656a9a02420253feda1fff5c30aeeb1fcd552 From a341585c58aeeb62d2a4a51807bc6de25f277b56 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 16 Oct 2024 22:30:13 +0300 Subject: [PATCH 179/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 92a87a0..28f3471 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 92a87a0c64f58a96227827b148cd3a79bc145e39 +Subproject commit 28f347103694c9e47dc29983eea34b4b45af580a From fc0fa08bfc453c92879f6fba4b42c6c96c0a74e7 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 23 Oct 2024 19:12:19 +0300 Subject: [PATCH 180/266] cd, pip, qad, qglengine --- README.md | 2 ++ cd | 2 +- pip | 2 +- qad | 2 +- qglengine | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 31fa360..e645f7b 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ After successfully install, you can use next CMake imported targets: * PIP::OpenCL - PIP OpenCL bindings * PIP::IOUtils * PIP::Cloud - PIP cloud IODevices + * PIP::ClientServer - TCP Client-Server * PIP::Lua - PIP Lua bindings * QAD: * QAD::Utils @@ -41,6 +42,7 @@ After successfully install, you can use next CMake imported targets: * QAD::SQLTable - widget for display and edit data based on SQL tables with relations * QAD::TouchWidgets - collection of widgets for touch screen interface * QAD::Doc - markdown helper for qt + * QAD::Map - OpenStreetMap map viewer and set of items * QAD::PIQt - helpers to convert PIP <-> Qt types * QAD::PIQtUtils - Gui libraries and executables to edit PIConnection configs and watch PIIntrospection * diff --git a/cd b/cd index b6898b9..0c36565 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit b6898b96f7c41e8577e08ab4206f93553b3dd659 +Subproject commit 0c36565aecc0630730225d9ce55186c3117914b8 diff --git a/pip b/pip index 28f3471..9f1d23a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 28f347103694c9e47dc29983eea34b4b45af580a +Subproject commit 9f1d23ad8ef5ee40ad21fb029e7ddb4bf59929f0 diff --git a/qad b/qad index 26a656a..f8fec93 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 26a656a9a02420253feda1fff5c30aeeb1fcd552 +Subproject commit f8fec93f0e99645b09c1d85dcdff47f2df1f0f68 diff --git a/qglengine b/qglengine index c642ec6..7dfaf92 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit c642ec603fdd306a578c56ba026a03c1c69a774e +Subproject commit 7dfaf924e5c41dd69100a06c4ba35465621ea5d8 From 7713ca18f7d443f874224f5c99f58575c8c6f0c8 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 2 Nov 2024 14:15:59 +0300 Subject: [PATCH 181/266] cd, pip, qad, qglengine --- cd | 2 +- pip | 2 +- qad | 2 +- qglengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cd b/cd index 0c36565..b65bf5e 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 0c36565aecc0630730225d9ce55186c3117914b8 +Subproject commit b65bf5e6406108a9f53627a308419b51d41e2e4e diff --git a/pip b/pip index 9f1d23a..df75efe 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9f1d23ad8ef5ee40ad21fb029e7ddb4bf59929f0 +Subproject commit df75efe8810c6a7d0dda9b343ff4c4f2c58ccf08 diff --git a/qad b/qad index f8fec93..8f969a1 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit f8fec93f0e99645b09c1d85dcdff47f2df1f0f68 +Subproject commit 8f969a1b41f89d6fe4694aa7fcbc00963b8cd086 diff --git a/qglengine b/qglengine index 7dfaf92..5a71585 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 7dfaf924e5c41dd69100a06c4ba35465621ea5d8 +Subproject commit 5a7158531f1b011fbcea0c16fd0dcf1f28a4bfce From 71b3272d1b32f8b8f97ffb3f4b74048ba0b5c8e0 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 10 Nov 2024 21:29:44 +0300 Subject: [PATCH 182/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index df75efe..5b066cb 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit df75efe8810c6a7d0dda9b343ff4c4f2c58ccf08 +Subproject commit 5b066cbc27c274248d609e0d5c1e80188abac637 diff --git a/qad b/qad index 8f969a1..1becca7 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 8f969a1b41f89d6fe4694aa7fcbc00963b8cd086 +Subproject commit 1becca7519b0a8ab2babe8e74288d2bb9c9d72d9 From 100421bed659153b06607259a6b1c40c778681cb Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 14:18:56 +0300 Subject: [PATCH 183/266] testing support --- Jenkinsfile | 16 +++++++++++++--- pip | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index df09ae2..d355b36 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,10 @@ @Library('SHS.Platforms') _ -def build_docker(dist, release_dir) { +def build_docker(dist, release_dir, is_testing) { def image_name = "${dist.docker_image}-shstk" + if (is_testing) { + image_name += "-test" + } + echo "Build image ${image_name}" def args = "" for (arg in dist.docker_build_options) { @@ -23,18 +27,24 @@ node { stage("Download SRC") { checkout scm } - + + def currentBranch = "${env.BRANCH_NAME}" + def is_testing = currentBranch.toLowerCase().contains("test") + def pl = new org.SHS.Platforms(this) pl.get() def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/release' + if (is_testing) { + rel_dir += "-test" + } echo "Release to ${rel_dir}" sh "rm -rvf ${rel_dir}" sh "mkdir -p ${rel_dir}" def _msg = "Built images:" pl.forEach ({ dist -> - _msg += build_docker(dist, rel_dir) + _msg += build_docker(dist, rel_dir, is_testing) }, stageSuffix: "-shstk", ondemand: true diff --git a/pip b/pip index 5b066cb..ee137b2 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 5b066cbc27c274248d609e0d5c1e80188abac637 +Subproject commit ee137b2820a8ca39a41031a893c904725ca21cfc From c4ead44fde12e2a35925462134841355a621db07 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 14:40:01 +0300 Subject: [PATCH 184/266] pass branch name to docker build --- Jenkinsfile | 3 +++ docker/android-shstk/Dockerfile | 3 ++- docker/astra1.7-shstk/Dockerfile | 3 ++- docker/astra1.8-shstk/Dockerfile | 3 ++- docker/linux_cross-shstk/Dockerfile | 3 ++- docker/linux_desktop-shstk/Dockerfile | 3 ++- docker/osx-shstk/Dockerfile | 3 ++- docker/pi-shstk/Dockerfile | 3 ++- docker/windows-shstk/Dockerfile | 3 ++- docker/windows32-shstk/Dockerfile | 3 ++- 10 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d355b36..69d867d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,6 +13,9 @@ def build_docker(dist, release_dir, is_testing) { if (env.DOCKER_PREFIX) { args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" } + if (env.BRANCH_NAME) { + args += " --build-arg BRANCH=${env.BRANCH_NAME}" + } args += " --build-arg IMAGE_FROM=${dist.docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" diff --git a/docker/android-shstk/Dockerfile b/docker/android-shstk/Dockerfile index cb535f7..5da7a53 100644 --- a/docker/android-shstk/Dockerfile +++ b/docker/android-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}android ARG LIBS_BUILD_NUMBER=9999 @@ -10,7 +11,7 @@ ENV ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake ENV NDK_PLATFORM="android-21" WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/astra1.7-shstk/Dockerfile b/docker/astra1.7-shstk/Dockerfile index b214846..fabcc20 100644 --- a/docker/astra1.7-shstk/Dockerfile +++ b/docker/astra1.7-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM +ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 @@ -8,7 +9,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/astra1.8-shstk/Dockerfile b/docker/astra1.8-shstk/Dockerfile index b214846..fabcc20 100644 --- a/docker/astra1.8-shstk/Dockerfile +++ b/docker/astra1.8-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM +ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 @@ -8,7 +9,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile index cc83f19..0a0888e 100644 --- a/docker/linux_cross-shstk/Dockerfile +++ b/docker/linux_cross-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM +ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 @@ -8,7 +9,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index b214846..fabcc20 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM +ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 @@ -8,7 +9,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/osx-shstk/Dockerfile b/docker/osx-shstk/Dockerfile index 4e67335..ed3cb66 100644 --- a/docker/osx-shstk/Dockerfile +++ b/docker/osx-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}osx ARG LIBS_BUILD_NUMBER=9999 @@ -6,7 +7,7 @@ ARG JOBS_COUNT=4 ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile index 363b367..d03ce70 100644 --- a/docker/pi-shstk/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}pi ARG LIBS_BUILD_NUMBER=9999 @@ -6,7 +7,7 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/windows-shstk/Dockerfile b/docker/windows-shstk/Dockerfile index e11e48f..a513296 100644 --- a/docker/windows-shstk/Dockerfile +++ b/docker/windows-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}windows ARG LIBS_BUILD_NUMBER=9999 @@ -6,7 +7,7 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile index d454355..c1e07fb 100644 --- a/docker/windows32-shstk/Dockerfile +++ b/docker/windows32-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}windows32 ARG LIBS_BUILD_NUMBER=9999 @@ -6,7 +7,7 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ From 67272f91492f0500cf51aabcb10d24996c06da3f Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 14:42:22 +0300 Subject: [PATCH 185/266] try --- docker/astra1.7-shstk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/astra1.7-shstk/Dockerfile b/docker/astra1.7-shstk/Dockerfile index fabcc20..715fc66 100644 --- a/docker/astra1.7-shstk/Dockerfile +++ b/docker/astra1.7-shstk/Dockerfile @@ -1,6 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG IMAGE_FROM ARG BRANCH=release +ARG IMAGE_FROM FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 From 4eadb31df2ea983ad50c5cdfdbc099c42c81402c Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 14:47:15 +0300 Subject: [PATCH 186/266] try2 --- docker/astra1.7-shstk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/astra1.7-shstk/Dockerfile b/docker/astra1.7-shstk/Dockerfile index 715fc66..875e581 100644 --- a/docker/astra1.7-shstk/Dockerfile +++ b/docker/astra1.7-shstk/Dockerfile @@ -1,8 +1,8 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release ARG IMAGE_FROM FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 From b0d08801b7901bedc9e7ce256a47208078678c48 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 14:49:37 +0300 Subject: [PATCH 187/266] Dockerfiles fix --- docker/android-shstk/Dockerfile | 2 +- docker/astra1.8-shstk/Dockerfile | 2 +- docker/linux_cross-shstk/Dockerfile | 2 +- docker/linux_desktop-shstk/Dockerfile | 2 +- docker/osx-shstk/Dockerfile | 2 +- docker/pi-shstk/Dockerfile | 2 +- docker/windows-shstk/Dockerfile | 2 +- docker/windows32-shstk/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/android-shstk/Dockerfile b/docker/android-shstk/Dockerfile index 5da7a53..2dfc9af 100644 --- a/docker/android-shstk/Dockerfile +++ b/docker/android-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}android +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH diff --git a/docker/astra1.8-shstk/Dockerfile b/docker/astra1.8-shstk/Dockerfile index fabcc20..875e581 100644 --- a/docker/astra1.8-shstk/Dockerfile +++ b/docker/astra1.8-shstk/Dockerfile @@ -1,8 +1,8 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM -ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile index 0a0888e..9e9f80b 100644 --- a/docker/linux_cross-shstk/Dockerfile +++ b/docker/linux_cross-shstk/Dockerfile @@ -1,8 +1,8 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM -ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index fabcc20..875e581 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -1,8 +1,8 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM -ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 diff --git a/docker/osx-shstk/Dockerfile b/docker/osx-shstk/Dockerfile index ed3cb66..9c23f44 100644 --- a/docker/osx-shstk/Dockerfile +++ b/docker/osx-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}osx +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile index d03ce70..e06ab48 100644 --- a/docker/pi-shstk/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}pi +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH diff --git a/docker/windows-shstk/Dockerfile b/docker/windows-shstk/Dockerfile index a513296..4f6c40d 100644 --- a/docker/windows-shstk/Dockerfile +++ b/docker/windows-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}windows +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile index c1e07fb..c8844c4 100644 --- a/docker/windows32-shstk/Dockerfile +++ b/docker/windows32-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}windows32 +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH From fe5eeac297a90f4a9b0668e64dd353ecac9121ac Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 15:43:18 +0300 Subject: [PATCH 188/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ee137b2..3d07795 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ee137b2820a8ca39a41031a893c904725ca21cfc +Subproject commit 3d077955159247549a139a323956772a31c158eb From 9eba538a5640dfff7b59145e068afc9fb87f70f4 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 15:48:12 +0300 Subject: [PATCH 189/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 3d07795..047d38e 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 3d077955159247549a139a323956772a31c158eb +Subproject commit 047d38ea594fc4751ce32df4c9f28ae20bfeaa67 From da1883822c9741308817f1f40962e00adaee5abd Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 16:23:55 +0300 Subject: [PATCH 190/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 047d38e..c67f7a2 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 047d38ea594fc4751ce32df4c9f28ae20bfeaa67 +Subproject commit c67f7a2b64aa32c7790e965826f82f126988af93 From 058f8d4026990628562d0022fe008aa82d315cc6 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 17:14:25 +0300 Subject: [PATCH 191/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index c67f7a2..f6b9131 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit c67f7a2b64aa32c7790e965826f82f126988af93 +Subproject commit f6b9131f4a4e915f1ede9221ba4857333daf8199 From 98c9ef3b9b6c8e35c794cab7b20583926706c385 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 18:02:34 +0300 Subject: [PATCH 192/266] Jenkinsfile --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 69d867d..21c7b64 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,10 +37,11 @@ node { def pl = new org.SHS.Platforms(this) pl.get() - def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/release' + def local_release_dir = 'release' if (is_testing) { - rel_dir += "-test" + local_release_dir += '-test' } + def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/' + local_release_dir echo "Release to ${rel_dir}" sh "rm -rvf ${rel_dir}" sh "mkdir -p ${rel_dir}" @@ -57,7 +58,7 @@ node { sh "docker system prune -f" } - archiveArtifacts 'release/*' + archiveArtifacts "${local_release_dir}/*" echo "${_msg}" } From 4cab304f4381fb48cb5a1521212af385ca186e44 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 16 Nov 2024 15:46:18 +0300 Subject: [PATCH 193/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index f6b9131..3483edb 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f6b9131f4a4e915f1ede9221ba4857333daf8199 +Subproject commit 3483edbd769ede16ed720687af347b841c3e6c1c From f8e39467b0ac4ed56d0c0feb4f7020a98d49baf7 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 18 Nov 2024 22:47:11 +0300 Subject: [PATCH 194/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 3483edb..2411249 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 3483edbd769ede16ed720687af347b841c3e6c1c +Subproject commit 24112498ce6339458a44a015d9f90fe147f30798 From 1e2cf22e0aa5cbc14d846c5d4f55ecf5989fb527 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 19 Nov 2024 15:23:44 +0300 Subject: [PATCH 195/266] 2000 last builds --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 21c7b64..1d99ec5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ def build_docker(dist, release_dir, is_testing) { } return "\n - ${image_name}" } -properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '20']], copyArtifactPermission('*')]); +properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '2000']], copyArtifactPermission('*')]); node { stage("Download SRC") { checkout scm From c2d53bf69b067ceb40530fb6e331277c7b526f45 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 20 Nov 2024 20:02:29 +0300 Subject: [PATCH 196/266] cd, pip, qad --- cd | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cd b/cd index b65bf5e..a3e88f7 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit b65bf5e6406108a9f53627a308419b51d41e2e4e +Subproject commit a3e88f792d58a95f943f1bd0d82d1f522a8b6f8d diff --git a/pip b/pip index 2411249..caa7880 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 24112498ce6339458a44a015d9f90fe147f30798 +Subproject commit caa7880cc4da1915dc373a0a1ec2e579221b2cf5 diff --git a/qad b/qad index 1becca7..04b40d3 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 1becca7519b0a8ab2babe8e74288d2bb9c9d72d9 +Subproject commit 04b40d367c31de816a974927b0b7d0e3d47e7282 From 37f5b499d1352b639677fee3faed57f4a039a077 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 21 Nov 2024 00:10:42 +0300 Subject: [PATCH 197/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index caa7880..002f21f 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit caa7880cc4da1915dc373a0a1ec2e579221b2cf5 +Subproject commit 002f21fc9ed31ffd38bd0862282c5ab82a1c8e64 From 8fbfab2d9d139b90ef7655cfc2df161fb4891a1d Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 21 Nov 2024 00:19:02 +0300 Subject: [PATCH 198/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 002f21f..4aa596b 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 002f21fc9ed31ffd38bd0862282c5ab82a1c8e64 +Subproject commit 4aa596b1797d61a673f36425a98a4fd99403925c From 0c8f0e3af5b1d34fcfbad91fb87e2a735f670577 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 21 Nov 2024 16:31:49 +0300 Subject: [PATCH 199/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 4aa596b..53ec75b 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 4aa596b1797d61a673f36425a98a4fd99403925c +Subproject commit 53ec75bf0cf8af95766f487186169db62f8885b8 From 92286944fbe186c2fee2cb4705821c1ed1083b15 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 25 Nov 2024 15:00:50 +0300 Subject: [PATCH 200/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 53ec75b..58b3fa6 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 53ec75bf0cf8af95766f487186169db62f8885b8 +Subproject commit 58b3fa64bc69dee10f1ccc53369c5eea5aeed39f From 6de1c8cffb78acbdbabcd181cdf4e9ede5595bae Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 25 Nov 2024 15:53:20 +0300 Subject: [PATCH 201/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 58b3fa6..6f6b717 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 58b3fa64bc69dee10f1ccc53369c5eea5aeed39f +Subproject commit 6f6b717354edc726969a40d7729280513d7382d0 From e960e28f6d6a3492a04918d64fadbe4f4a6949ef Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 25 Nov 2024 16:02:46 +0300 Subject: [PATCH 202/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 6f6b717..12114b3 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 6f6b717354edc726969a40d7729280513d7382d0 +Subproject commit 12114b3e778a3816215422b01a1f63e7fbc32e9c From a3380922a26ef13efaae96666b51c09eba6b84a4 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 28 Nov 2024 12:37:18 +0300 Subject: [PATCH 203/266] pip, cd --- Jenkinsfile | 6 +++--- cd | 2 +- pip | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d99ec5..a1cacd1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,8 +13,8 @@ def build_docker(dist, release_dir, is_testing) { if (env.DOCKER_PREFIX) { args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" } - if (env.BRANCH_NAME) { - args += " --build-arg BRANCH=${env.BRANCH_NAME}" + if (env.GIT_LOCAL_BRANCH) { + args += " --build-arg BRANCH=${env.GIT_LOCAL_BRANCH}" } args += " --build-arg IMAGE_FROM=${dist.docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" @@ -31,7 +31,7 @@ node { checkout scm } - def currentBranch = "${env.BRANCH_NAME}" + def currentBranch = "${env.GIT_LOCAL_BRANCH}" def is_testing = currentBranch.toLowerCase().contains("test") def pl = new org.SHS.Platforms(this) diff --git a/cd b/cd index a3e88f7..31bacbe 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit a3e88f792d58a95f943f1bd0d82d1f522a8b6f8d +Subproject commit 31bacbedae30347688f56acedaf206e4c5874bc8 diff --git a/pip b/pip index 12114b3..4f934fe 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 12114b3e778a3816215422b01a1f63e7fbc32e9c +Subproject commit 4f934fef353adf93117166b6ead19a3ee849276b From 40f2a424ac503f7657a08149499a808ba75ad0a6 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 28 Nov 2024 12:44:29 +0300 Subject: [PATCH 204/266] Jenkinsfile --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a1cacd1..1d99ec5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,8 +13,8 @@ def build_docker(dist, release_dir, is_testing) { if (env.DOCKER_PREFIX) { args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" } - if (env.GIT_LOCAL_BRANCH) { - args += " --build-arg BRANCH=${env.GIT_LOCAL_BRANCH}" + if (env.BRANCH_NAME) { + args += " --build-arg BRANCH=${env.BRANCH_NAME}" } args += " --build-arg IMAGE_FROM=${dist.docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" @@ -31,7 +31,7 @@ node { checkout scm } - def currentBranch = "${env.GIT_LOCAL_BRANCH}" + def currentBranch = "${env.BRANCH_NAME}" def is_testing = currentBranch.toLowerCase().contains("test") def pl = new org.SHS.Platforms(this) From 72c82b787c042491bef8d8c06b54ca8ee53ccb2e Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 28 Nov 2024 13:36:11 +0300 Subject: [PATCH 205/266] pip, Jenkinsfile --- Jenkinsfile | 4 +++- pip | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d99ec5..ee35104 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,9 @@ def build_docker(dist, release_dir, is_testing) { args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" } if (env.BRANCH_NAME) { - args += " --build-arg BRANCH=${env.BRANCH_NAME}" + if ("${env.BRANCH_NAME}" != "shstk") { + args += " --build-arg BRANCH=${env.BRANCH_NAME}" + } } args += " --build-arg IMAGE_FROM=${dist.docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" diff --git a/pip b/pip index 4f934fe..cae264a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 4f934fef353adf93117166b6ead19a3ee849276b +Subproject commit cae264a77b52f54b56a8ce237bb56eabbc60fbef From 549b9864e0fcd07be5b56aebd6fe67df061b4d31 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 3 Dec 2024 11:26:14 +0300 Subject: [PATCH 206/266] test debug builds --- Jenkinsfile | 19 +++++++++++++++---- cmake | 2 +- docker/android-shstk/Dockerfile | 8 ++++---- docker/astra1.7-shstk/Dockerfile | 2 +- docker/astra1.8-shstk/Dockerfile | 2 +- docker/linux_cross-shstk/Dockerfile | 2 +- docker/linux_desktop-shstk/Dockerfile | 2 +- docker/osx-shstk/Dockerfile | 2 +- docker/pi-shstk/Dockerfile | 2 +- docker/windows-shstk/Dockerfile | 2 +- docker/windows32-shstk/Dockerfile | 2 +- pip | 2 +- 12 files changed, 29 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ee35104..05e18f3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,9 +1,14 @@ @Library('SHS.Platforms') _ -def build_docker(dist, release_dir, is_testing) { +def build_docker(dist, release_dir, is_testing, is_debug) { + def image_from = "${dist.docker_image}" def image_name = "${dist.docker_image}-shstk" if (is_testing) { image_name += "-test" } + if (is_debug) { + image_from += "-debug" + image_name += "-debug" + } echo "Build image ${image_name}" def args = "" @@ -18,7 +23,7 @@ def build_docker(dist, release_dir, is_testing) { args += " --build-arg BRANCH=${env.BRANCH_NAME}" } } - args += " --build-arg IMAGE_FROM=${dist.docker_image}" + args += " --build-arg IMAGE_FROM=${image_from}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" def shstk_docker = docker.build("${image_name}", "./docker/${dist.docker_dir}-shstk --no-cache ${args}") @@ -27,7 +32,11 @@ def build_docker(dist, release_dir, is_testing) { } return "\n - ${image_name}" } -properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '2000']], copyArtifactPermission('*')]); +properties([ + [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '2000']], + [booleanParam(name: 'Debug', defaultValue: false, description: 'Build debug version')], + copyArtifactPermission('*') +]); node { stage("Download SRC") { checkout scm @@ -35,6 +44,7 @@ node { def currentBranch = "${env.BRANCH_NAME}" def is_testing = currentBranch.toLowerCase().contains("test") + def is_debug = Boolean.valueOf(Debug)) def pl = new org.SHS.Platforms(this) pl.get() @@ -43,6 +53,7 @@ node { if (is_testing) { local_release_dir += '-test' } + def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/' + local_release_dir echo "Release to ${rel_dir}" sh "rm -rvf ${rel_dir}" @@ -50,7 +61,7 @@ node { def _msg = "Built images:" pl.forEach ({ dist -> - _msg += build_docker(dist, rel_dir, is_testing) + _msg += build_docker(dist, rel_dir, is_testing, is_debug) }, stageSuffix: "-shstk", ondemand: true diff --git a/cmake b/cmake index 7d53e93..0d3b2de 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 7d53e9379939a5bc07bb13f3f7b94bc6bd0119ec +Subproject commit 0d3b2ded8e8572d5d06f5a9dbca7ca93005b37c9 diff --git a/docker/android-shstk/Dockerfile b/docker/android-shstk/Dockerfile index 2dfc9af..78792f5 100644 --- a/docker/android-shstk/Dockerfile +++ b/docker/android-shstk/Dockerfile @@ -23,22 +23,22 @@ WORKDIR /soft/shstk_build_anroid ENV _ANDROID_TOOLCHAIN=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake ENV _CUR_ABI=armeabi-v7a -RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf * ENV _CUR_ABI=arm64-v8a WORKDIR /soft/shstk_build_android_${_CUR_ABI} -RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf * ENV _CUR_ABI=x86 WORKDIR /soft/shstk_build_android_${_CUR_ABI} -RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf * ENV _CUR_ABI=x86_64 WORKDIR /soft/shstk_build_android_${_CUR_ABI} -RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf * RUN mkdir -p /soft/shstk/release diff --git a/docker/astra1.7-shstk/Dockerfile b/docker/astra1.7-shstk/Dockerfile index 875e581..e1f31a2 100644 --- a/docker/astra1.7-shstk/Dockerfile +++ b/docker/astra1.7-shstk/Dockerfile @@ -12,7 +12,7 @@ WORKDIR /soft RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux -RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && ldconfig \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ diff --git a/docker/astra1.8-shstk/Dockerfile b/docker/astra1.8-shstk/Dockerfile index 875e581..e1f31a2 100644 --- a/docker/astra1.8-shstk/Dockerfile +++ b/docker/astra1.8-shstk/Dockerfile @@ -12,7 +12,7 @@ WORKDIR /soft RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux -RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && ldconfig \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile index 9e9f80b..590b8d6 100644 --- a/docker/linux_cross-shstk/Dockerfile +++ b/docker/linux_cross-shstk/Dockerfile @@ -18,7 +18,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} .. && ldconfig WORKDIR /soft/shstk_build -RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \ +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ && rm -rf * diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index 875e581..e1f31a2 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -12,7 +12,7 @@ WORKDIR /soft RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux -RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && ldconfig \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ diff --git a/docker/osx-shstk/Dockerfile b/docker/osx-shstk/Dockerfile index 9c23f44..be85dda 100644 --- a/docker/osx-shstk/Dockerfile +++ b/docker/osx-shstk/Dockerfile @@ -16,7 +16,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} .. && ldconfig WORKDIR /soft/shstk_build_osx -RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \ +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ && rm -rf * diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile index e06ab48..ce46d1a 100644 --- a/docker/pi-shstk/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -16,7 +16,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} .. && ldconfig WORKDIR /soft/shstk_build_pi -RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \ +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ && rm -rf * diff --git a/docker/windows-shstk/Dockerfile b/docker/windows-shstk/Dockerfile index 4f6c40d..53c101e 100644 --- a/docker/windows-shstk/Dockerfile +++ b/docker/windows-shstk/Dockerfile @@ -16,7 +16,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} .. && ldconfig WORKDIR /soft/shstk_build_windows -RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \ +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ && rm -rf * diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile index c8844c4..11b1bb4 100644 --- a/docker/windows32-shstk/Dockerfile +++ b/docker/windows32-shstk/Dockerfile @@ -16,7 +16,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} .. && ldconfig WORKDIR /soft/shstk_build_windows32 -RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/windows32 -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows32.cmake ../shstk/ \ +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/windows32 -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows32.cmake ../shstk/ \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ && rm -rf * diff --git a/pip b/pip index cae264a..9b8a158 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit cae264a77b52f54b56a8ce237bb56eabbc60fbef +Subproject commit 9b8a1583c2ace817044cb50517aa7c0209ff5a04 From 614729cc943857f1ad4ced96269e8bb49260a09c Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 3 Dec 2024 11:28:44 +0300 Subject: [PATCH 207/266] fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 05e18f3..760bb7f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,7 @@ node { def currentBranch = "${env.BRANCH_NAME}" def is_testing = currentBranch.toLowerCase().contains("test") - def is_debug = Boolean.valueOf(Debug)) + def is_debug = Boolean.valueOf(Debug) def pl = new org.SHS.Platforms(this) pl.get() From 348d39f566e23163fcc6761d42ef276c6632b1c8 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 3 Dec 2024 11:31:08 +0300 Subject: [PATCH 208/266] try to work --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 760bb7f..942cded 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ def build_docker(dist, release_dir, is_testing, is_debug) { } properties([ [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '2000']], - [booleanParam(name: 'Debug', defaultValue: false, description: 'Build debug version')], + booleanParam(name: 'Debug', defaultValue: false, description: 'Build debug version'), copyArtifactPermission('*') ]); node { From cf130ec0540ba18d837e7429b9aff2e9a0148e98 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 3 Dec 2024 11:33:43 +0300 Subject: [PATCH 209/266] another try --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 942cded..273b930 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,9 @@ def build_docker(dist, release_dir, is_testing, is_debug) { } properties([ [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '2000']], - booleanParam(name: 'Debug', defaultValue: false, description: 'Build debug version'), + parameters([ + booleanParam(name: 'Debug', defaultValue: false, description: 'Build debug version') + ]), copyArtifactPermission('*') ]); node { @@ -44,7 +46,7 @@ node { def currentBranch = "${env.BRANCH_NAME}" def is_testing = currentBranch.toLowerCase().contains("test") - def is_debug = Boolean.valueOf(Debug) + def is_debug = Boolean.valueOf(Debug)) def pl = new org.SHS.Platforms(this) pl.get() From 52caaa7b4726bf505ef7f316468011d820da0511 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 3 Dec 2024 11:34:28 +0300 Subject: [PATCH 210/266] rrr --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 273b930..4615755 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,7 +46,7 @@ node { def currentBranch = "${env.BRANCH_NAME}" def is_testing = currentBranch.toLowerCase().contains("test") - def is_debug = Boolean.valueOf(Debug)) + def is_debug = Boolean.valueOf(Debug) def pl = new org.SHS.Platforms(this) pl.get() From 812fe7309244e2ee52eddddf64c6d8c849ba2f46 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 3 Dec 2024 13:32:24 +0300 Subject: [PATCH 211/266] fix dockers --- docker/android-shstk/Dockerfile | 3 ++- docker/osx-shstk/Dockerfile | 3 ++- docker/pi-shstk/Dockerfile | 3 ++- docker/windows-shstk/Dockerfile | 3 ++- docker/windows32-shstk/Dockerfile | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/docker/android-shstk/Dockerfile b/docker/android-shstk/Dockerfile index 78792f5..37045da 100644 --- a/docker/android-shstk/Dockerfile +++ b/docker/android-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ -FROM ${DOCKER_PREFIX}android +ARG IMAGE_FROM +FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 diff --git a/docker/osx-shstk/Dockerfile b/docker/osx-shstk/Dockerfile index be85dda..8ad666e 100644 --- a/docker/osx-shstk/Dockerfile +++ b/docker/osx-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ -FROM ${DOCKER_PREFIX}osx +ARG IMAGE_FROM +FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile index ce46d1a..b1bdb9a 100644 --- a/docker/pi-shstk/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ -FROM ${DOCKER_PREFIX}pi +ARG IMAGE_FROM +FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 diff --git a/docker/windows-shstk/Dockerfile b/docker/windows-shstk/Dockerfile index 53c101e..2d05dfc 100644 --- a/docker/windows-shstk/Dockerfile +++ b/docker/windows-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ -FROM ${DOCKER_PREFIX}windows +ARG IMAGE_FROM +FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile index 11b1bb4..7b80599 100644 --- a/docker/windows32-shstk/Dockerfile +++ b/docker/windows32-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ -FROM ${DOCKER_PREFIX}windows32 +ARG IMAGE_FROM +FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 From 51f3eda2a8d3a41656aa2c47030d3d6cb3f61116 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 3 Dec 2024 15:41:43 +0300 Subject: [PATCH 212/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 9b8a158..9e08b6f 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9b8a1583c2ace817044cb50517aa7c0209ff5a04 +Subproject commit 9e08b6ffc53056a0bdb8ac558e1d762e0195dda1 From 1d84f21fe4087b6b04885c70a07c03d52ffdfce7 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 19 Dec 2024 14:58:45 +0300 Subject: [PATCH 213/266] tmp --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4615755..d5ede8c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ def build_docker(dist, release_dir, is_testing, is_debug) { return "\n - ${image_name}" } properties([ - [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '2000']], + buildDiscarder(logRotator(numToKeepStr: "2000", artifactNumToKeepStr: "10")), parameters([ booleanParam(name: 'Debug', defaultValue: false, description: 'Build debug version') ]), @@ -65,6 +65,7 @@ node { pl.forEach ({ dist -> _msg += build_docker(dist, rel_dir, is_testing, is_debug) }, + whiteList: ["astra"], stageSuffix: "-shstk", ondemand: true ) From 599247f10a40bcb4636caf340eb483c159b55fbb Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 19 Dec 2024 15:01:27 +0300 Subject: [PATCH 214/266] j --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d5ede8c..8f18cd3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,7 +65,6 @@ node { pl.forEach ({ dist -> _msg += build_docker(dist, rel_dir, is_testing, is_debug) }, - whiteList: ["astra"], stageSuffix: "-shstk", ondemand: true ) From 43dd680a7878a9dd991cec4599ee0897ed64877c Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 19 Dec 2024 21:23:06 +0300 Subject: [PATCH 215/266] cmake --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 0d3b2de..7784497 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 0d3b2ded8e8572d5d06f5a9dbca7ca93005b37c9 +Subproject commit 77844971651bfab24290e67fee4f14285bad12b0 From 39fae97c622d0363b1fe33763d6e3d0615e6b35b Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 25 Dec 2024 13:00:41 +0300 Subject: [PATCH 216/266] new platforms --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8f18cd3..6283dd0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ @Library('SHS.Platforms') _ def build_docker(dist, release_dir, is_testing, is_debug) { - def image_from = "${dist.docker_image}" - def image_name = "${dist.docker_image}-shstk" + def image_from = "${dist.docker.image_basename}" + def image_name = "${dist.docker.image_basename}-shstk" if (is_testing) { image_name += "-test" } @@ -12,7 +12,7 @@ def build_docker(dist, release_dir, is_testing, is_debug) { echo "Build image ${image_name}" def args = "" - for (arg in dist.docker_build_options) { + for (arg in dist.docker.build_options) { args += " --build-arg ${arg.key}=\"${arg.value}\"" } if (env.DOCKER_PREFIX) { @@ -26,7 +26,7 @@ def build_docker(dist, release_dir, is_testing, is_debug) { args += " --build-arg IMAGE_FROM=${image_from}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" - def shstk_docker = docker.build("${image_name}", "./docker/${dist.docker_dir}-shstk --no-cache ${args}") + def shstk_docker = docker.build("${image_name}", "./docker/${dist.docker.directory}-shstk --no-cache ${args}") shstk_docker.inside("-v " + release_dir + ":/soft/release") { sh 'cp -vf /soft/shstk/release/* /soft/release/ || true' } From f658eab4d582c1fb0a674e326a02f2d7a0b8724f Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 25 Dec 2024 19:30:25 +0300 Subject: [PATCH 217/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 9e08b6f..ffc4713 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9e08b6ffc53056a0bdb8ac558e1d762e0195dda1 +Subproject commit ffc471359a151169ef74e1392632c9ce0f6a383a From 250aa613ad9434b5dbcc56e023b0f3d6ca37f446 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 25 Dec 2024 19:34:57 +0300 Subject: [PATCH 218/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ffc4713..b50eeae 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ffc471359a151169ef74e1392632c9ce0f6a383a +Subproject commit b50eeaef462edb566b9eb55cc2b4e5a573d09278 From c60158c1677d83bfcad8d4db94bc31bb82c88cfe Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 25 Dec 2024 19:38:05 +0300 Subject: [PATCH 219/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index b50eeae..6e55569 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b50eeaef462edb566b9eb55cc2b4e5a573d09278 +Subproject commit 6e5556969de96206b186fd86512cc435c7234889 From 954ae79c5c29f53bf65a4e95b687808107e8b631 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 26 Dec 2024 16:02:03 +0300 Subject: [PATCH 220/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 6e55569..64025e0 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 6e5556969de96206b186fd86512cc435c7234889 +Subproject commit 64025e03991c8b0ce7b693d99bd741f247951d8e From 6fb2c089d9b08c365493cd720a119e8582f47a13 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 26 Dec 2024 16:12:09 +0300 Subject: [PATCH 221/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 64025e0..855d1ca 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 64025e03991c8b0ce7b693d99bd741f247951d8e +Subproject commit 855d1ca1b5abe782b405a658e1cd2183b73b5a46 From 41a0eb8549d495d49a28439343219f8f9dfe4f40 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 26 Dec 2024 16:16:09 +0300 Subject: [PATCH 222/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 855d1ca..199a272 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 855d1ca1b5abe782b405a658e1cd2183b73b5a46 +Subproject commit 199a272eb84a8b53df2d615fbaf5c8e0e54c3cf4 From ac2d19de686243159952929e5e67a9e130cd2bf2 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 26 Dec 2024 16:18:20 +0300 Subject: [PATCH 223/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 199a272..a300449 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 199a272eb84a8b53df2d615fbaf5c8e0e54c3cf4 +Subproject commit a3004491d601dfb2ce577278ac9a33746666da02 From e0461816000b1f84888746accd8df39435117657 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 26 Dec 2024 16:19:41 +0300 Subject: [PATCH 224/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index a300449..0973379 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit a3004491d601dfb2ce577278ac9a33746666da02 +Subproject commit 0973379f53c803d43d03b4d2024da06ad2881283 From 47dee3e0bdb906b6a8dd3cbd9d16c68c3e22aa60 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 29 Dec 2024 11:48:34 +0300 Subject: [PATCH 225/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 0973379..15548de 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 0973379f53c803d43d03b4d2024da06ad2881283 +Subproject commit 15548de79c3cd76ef1d5c458242f123c065bec4a From 5da9a31eda3ae270753e1088805c6b7c1fd7df11 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 8 Jan 2025 17:37:11 +0300 Subject: [PATCH 226/266] cmake, pip, qad --- cmake | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake b/cmake index 7784497..558034b 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 77844971651bfab24290e67fee4f14285bad12b0 +Subproject commit 558034bbdb8872e1fd6bb69190adb3c837bbcbca diff --git a/pip b/pip index 15548de..f334a66 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 15548de79c3cd76ef1d5c458242f123c065bec4a +Subproject commit f334a6603f8eca77eefdf58087bf2be9dfd19143 diff --git a/qad b/qad index 04b40d3..266e9ac 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 04b40d367c31de816a974927b0b7d0e3d47e7282 +Subproject commit 266e9ac3512047b01f6d52441ff0ef2d04a54e36 From aa15caa29880f33ebea26f20e725394c8ab567d7 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 9 Jan 2025 17:36:48 +0300 Subject: [PATCH 227/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index f334a66..7757ac1 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f334a6603f8eca77eefdf58087bf2be9dfd19143 +Subproject commit 7757ac10eca163a2c99755f4d3613efb73a19b41 From a8ca3056710f511be03e71bf9eb6c0b10dd55e52 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 12 Jan 2025 13:11:08 +0300 Subject: [PATCH 228/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 7757ac1..60d2a83 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 7757ac10eca163a2c99755f4d3613efb73a19b41 +Subproject commit 60d2a83df58213d5f6a00bad5c38a822eb0beb3c From 398480e7237a8b7f86acb1293c39260fd67e982b Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 15 Jan 2025 17:59:12 +0300 Subject: [PATCH 229/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 60d2a83..0dd47f5 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 60d2a83df58213d5f6a00bad5c38a822eb0beb3c +Subproject commit 0dd47f50a048c6384d468e91c11b067299f04aad From d64cb3cc75dc469fd68cd7c8006f65fba3799164 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 15 Jan 2025 18:25:40 +0300 Subject: [PATCH 230/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 0dd47f5..5755d17 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 0dd47f50a048c6384d468e91c11b067299f04aad +Subproject commit 5755d172cdba4230edbd91be4f234eb085f1c3bc From 3713c8e4bf7598c8cfd83c42c3a0be20ba6cb319 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 15 Jan 2025 18:38:58 +0300 Subject: [PATCH 231/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 5755d17..82cda42 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 5755d172cdba4230edbd91be4f234eb085f1c3bc +Subproject commit 82cda42e75c3228199d95bbfea21ec12bc1d3ae7 From 7e4b05404200421c445a477c8f0b3f396fed02cd Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 17 Jan 2025 11:49:35 +0300 Subject: [PATCH 232/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 82cda42..d01baff 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 82cda42e75c3228199d95bbfea21ec12bc1d3ae7 +Subproject commit d01baffb0b17f9068454220cb6039e657e766917 From 2de259e20a8fbc3dabf17dbc09ca89cf8d5ad418 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 29 Jan 2025 11:53:52 +0300 Subject: [PATCH 233/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 266e9ac..f36038b 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 266e9ac3512047b01f6d52441ff0ef2d04a54e36 +Subproject commit f36038bf10322f24de81d70f6d5ed957a86be0ce From 464e40b8fd083df54e4d7e0fd0fe60253c675048 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 6 Feb 2025 11:13:54 +0300 Subject: [PATCH 234/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index d01baff..8e96750 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit d01baffb0b17f9068454220cb6039e657e766917 +Subproject commit 8e96750046a7d03e557cda2f347b16a39759c19b From eaa9ad26463c377c8ba83838772d82d80b2e3036 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 27 Feb 2025 21:26:40 +0300 Subject: [PATCH 235/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 8e96750..4340f54 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 8e96750046a7d03e557cda2f347b16a39759c19b +Subproject commit 4340f5444d0b298a5b1dc84b46009fdd203ebb7f From 90bb880dc8976fb73acbf895989e11bc06682373 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 4 Mar 2025 19:59:44 +0300 Subject: [PATCH 236/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index f36038b..bf11ca2 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit f36038bf10322f24de81d70f6d5ed957a86be0ce +Subproject commit bf11ca21c025e227e3c13cc20ec72b9ede53c4a2 From 2f64085db63848d1c60af9c0d42a2b7ae3344cf9 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 4 Mar 2025 20:20:17 +0300 Subject: [PATCH 237/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 4340f54..8e18ec1 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 4340f5444d0b298a5b1dc84b46009fdd203ebb7f +Subproject commit 8e18ec15c9c0b18d0a40556fb0582fb921eace13 From 20aeb0c32faa0652022e3c146d7708dc599a940b Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 6 Mar 2025 16:26:49 +0300 Subject: [PATCH 238/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 8e18ec1..f09fe03 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 8e18ec15c9c0b18d0a40556fb0582fb921eace13 +Subproject commit f09fe03e0d94592f7669bb290e569e0ebd36d455 From 179f03d0572dcd908db3752caf002115fd357fd5 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 18 Mar 2025 12:16:22 +0300 Subject: [PATCH 239/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index bf11ca2..347104d 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit bf11ca21c025e227e3c13cc20ec72b9ede53c4a2 +Subproject commit 347104d512d656ff22e12aa114f65ad37e49f7eb From 55c5f7700c4c1959e200caebb3dc4bf8df7eb8a4 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 18 Mar 2025 15:17:24 +0300 Subject: [PATCH 240/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 347104d..a0f2d80 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 347104d512d656ff22e12aa114f65ad37e49f7eb +Subproject commit a0f2d80b4f80a0101e1516d02c77183a68e0e91a From 18e88a5f4d065b598b0d56b4ecbc0cea5d433179 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 18 Mar 2025 16:24:13 +0300 Subject: [PATCH 241/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index a0f2d80..f0c2369 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit a0f2d80b4f80a0101e1516d02c77183a68e0e91a +Subproject commit f0c2369df0d6cc591922c679d1e6637930949772 From 7812b76afadd12cc3a4ba4f2eda63c96ed4b2896 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 19 Mar 2025 22:04:03 +0300 Subject: [PATCH 242/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index f0c2369..8df5802 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit f0c2369df0d6cc591922c679d1e6637930949772 +Subproject commit 8df58026c44714bb23c59027954ae5b177b29387 From 35b31d65054be6edff4a842d83d01a8deb410084 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 20 Mar 2025 18:48:26 +0300 Subject: [PATCH 243/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 8df5802..b8e8a13 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 8df58026c44714bb23c59027954ae5b177b29387 +Subproject commit b8e8a1300ec4e96d732d454a956595e256219f39 From bee3c14f631cd2f5d1e3836598f23117d45997f5 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 3 Apr 2025 16:00:49 +0300 Subject: [PATCH 244/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index f09fe03..78f79d9 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f09fe03e0d94592f7669bb290e569e0ebd36d455 +Subproject commit 78f79d92aadc9e015fa371c00ca0b20ce04c2f08 From a0b39f591728aecd881b9a326eab27cefa8b6569 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 29 Apr 2025 21:51:36 +0300 Subject: [PATCH 245/266] new cmake, pip --- CMakeLists.txt | 3 +++ cd | 2 +- cmake | 2 +- pip | 2 +- qad | 2 +- qglengine | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a1b135..55facf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,9 @@ cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain targ if (POLICY CMP0053) cmake_policy(SET CMP0053 NEW) # simpler variable expansion and escape sequence evaluation rules endif() +if (POLICY CMP0177) + cmake_policy(SET CMP0177 OLD) +endif() project(shstk) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" diff --git a/cd b/cd index 31bacbe..4d955bb 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 31bacbedae30347688f56acedaf206e4c5874bc8 +Subproject commit 4d955bb846de9e08dd3b8ea3adc1661855dead0a diff --git a/cmake b/cmake index 558034b..698d24e 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 558034bbdb8872e1fd6bb69190adb3c837bbcbca +Subproject commit 698d24e831aba9e529f2801e3d00b55869d763eb diff --git a/pip b/pip index 78f79d9..8a61cfe 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 78f79d92aadc9e015fa371c00ca0b20ce04c2f08 +Subproject commit 8a61cfe7ef8d1e208514d7d33c77638b3860c24a diff --git a/qad b/qad index b8e8a13..49ae147 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit b8e8a1300ec4e96d732d454a956595e256219f39 +Subproject commit 49ae1473f9faf4a6cbf4c50e36531775d3db3f50 diff --git a/qglengine b/qglengine index 5a71585..d269f30 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 5a7158531f1b011fbcea0c16fd0dcf1f28a4bfce +Subproject commit d269f30107930b19c065ad2697a405a0a746dee8 From 5dd239c77c69e09f6a8a7cd485de2536bcd4489f Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 30 Apr 2025 15:07:34 +0300 Subject: [PATCH 246/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 8a61cfe..dfdc4b8 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 8a61cfe7ef8d1e208514d7d33c77638b3860c24a +Subproject commit dfdc4b8bdc7ccc34d3efd85b2e0f7ef65425c52a From ec470da92ab71c6d5d2629f78c24d206585b650d Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 14 May 2025 19:46:53 +0300 Subject: [PATCH 247/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index dfdc4b8..87ab4c4 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit dfdc4b8bdc7ccc34d3efd85b2e0f7ef65425c52a +Subproject commit 87ab4c4c287419b435c7a80fc1eabb3d86e41dab From 51fe3a686c8d4f7b210b48ea89839874f137a9ee Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 18 May 2025 18:53:41 +0300 Subject: [PATCH 248/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 87ab4c4..bad51db 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 87ab4c4c287419b435c7a80fc1eabb3d86e41dab +Subproject commit bad51db0c8a1f254885af7e1f24a1c76f6d3c1b3 From 9df894d3e46ec1ed448c1c165b30877b8ae79b30 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 7 Jun 2025 11:12:55 +0300 Subject: [PATCH 249/266] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index bad51db..e57719c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit bad51db0c8a1f254885af7e1f24a1c76f6d3c1b3 +Subproject commit e57719c11871b2b9cae0eef4890740ade164b89b diff --git a/qad b/qad index 49ae147..f9a8f5d 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 49ae1473f9faf4a6cbf4c50e36531775d3db3f50 +Subproject commit f9a8f5d6b17746e3fbf605d07fdf623881804e4e From 24061a4a504d3396381bcec115754c5cb4150cf0 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 9 Jun 2025 23:42:08 +0300 Subject: [PATCH 250/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index f9a8f5d..c959a71 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit f9a8f5d6b17746e3fbf605d07fdf623881804e4e +Subproject commit c959a712f70714952c30f219bdb242d43fcd51b5 From 2c656dec364fce9cc7deb34f0183010da2910ae2 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 10 Jun 2025 00:02:56 +0300 Subject: [PATCH 251/266] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index c959a71..d403d0a 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit c959a712f70714952c30f219bdb242d43fcd51b5 +Subproject commit d403d0a242fe5fdb16bf170189994c2320eca043 From 55d315d8b39f18766a50c8435cb26fee1715b6d2 Mon Sep 17 00:00:00 2001 From: Andrey Bychkov Date: Thu, 26 Jun 2025 17:43:51 +0300 Subject: [PATCH 252/266] qcodeedit fix incorrect completer position --- .gitignore | 1 + qad | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 48a9424..0173eb3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ CMakeLists.txt.user* /release /build +/build* /*_build_* diff --git a/qad b/qad index d403d0a..0f13cf5 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit d403d0a242fe5fdb16bf170189994c2320eca043 +Subproject commit 0f13cf5196dbc9c4756bbf051f808fb3b289f304 From eb1e7e68278673df72d995638279b02d1f0447ec Mon Sep 17 00:00:00 2001 From: Andrey Bychkov Date: Thu, 26 Jun 2025 17:45:13 +0300 Subject: [PATCH 253/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index e57719c..7b52f6d 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit e57719c11871b2b9cae0eef4890740ade164b89b +Subproject commit 7b52f6d70d6c0cf6f498f50477963efa185cfa0f From 79c780024d3c909b5c4bd624db6a86e5ce481a8b Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 17 Jul 2025 11:18:30 +0300 Subject: [PATCH 254/266] cmake, pip, qad --- cmake | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake b/cmake index 698d24e..da13c52 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 698d24e831aba9e529f2801e3d00b55869d763eb +Subproject commit da13c52c51aad9fedac0b4aba46eb07e840ce486 diff --git a/pip b/pip index e57719c..9504792 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit e57719c11871b2b9cae0eef4890740ade164b89b +Subproject commit 9504792586b675286c1c1bf4211c1c02ff2dceb4 diff --git a/qad b/qad index d403d0a..f8e3611 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit d403d0a242fe5fdb16bf170189994c2320eca043 +Subproject commit f8e361190b297f62a9c59fec968422767b3ede69 From 8f9f13f0069ff805f744f1f52a581ab63e00b643 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 17 Jul 2025 16:17:02 +0300 Subject: [PATCH 255/266] cmake --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index da13c52..f74a389 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit da13c52c51aad9fedac0b4aba46eb07e840ce486 +Subproject commit f74a38900f65077f0ce554271deb36ce411b0706 From a94109fbddcb9d0cd8b93282099f12d0ac034da1 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 30 Jul 2025 20:58:05 +0300 Subject: [PATCH 256/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 9504792..905d39c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9504792586b675286c1c1bf4211c1c02ff2dceb4 +Subproject commit 905d39c07b0b1b5ec49b88b93b5397a57a7f3d41 From c04d8b138f85b7386ddc5920e4565c1d24eb20d3 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 31 Jul 2025 20:56:04 +0300 Subject: [PATCH 257/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 905d39c..19f8f52 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 905d39c07b0b1b5ec49b88b93b5397a57a7f3d41 +Subproject commit 19f8f522b3c1e358c60acc40763143632a3bccca From 2ef3c2cb6136745992da9fdfa8aa3bb7fead822b Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 31 Jul 2025 20:56:55 +0300 Subject: [PATCH 258/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 19f8f52..19daab1 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 19f8f522b3c1e358c60acc40763143632a3bccca +Subproject commit 19daab173c09882fa8efc39aa8316353d5d9905e From d2903884de5e5c373bd62e78fdeca9d396167372 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 13 Aug 2025 18:50:07 +0300 Subject: [PATCH 259/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 19daab1..b6c5d65 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 19daab173c09882fa8efc39aa8316353d5d9905e +Subproject commit b6c5d65a8d0195f4fd82c9f103c4234a66f6b08f From 82e1ec849f93e6c580b1188c8af3fa97087b5916 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 14 Aug 2025 10:25:26 +0300 Subject: [PATCH 260/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index b6c5d65..a17644a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b6c5d65a8d0195f4fd82c9f103c4234a66f6b08f +Subproject commit a17644a953b07f5191c30c0b2c36e0f992f3d79f From f42df8089116161cddd05336d51de743e2b9482b Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 14 Aug 2025 17:34:54 +0300 Subject: [PATCH 261/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index a17644a..f2464ed 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit a17644a953b07f5191c30c0b2c36e0f992f3d79f +Subproject commit f2464ed76b550001943f72027e60afae65fa403a From d373e3b5391b34f64cabd75b4426e856519acbfe Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Aug 2025 18:54:30 +0300 Subject: [PATCH 262/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index f2464ed..27f37c9 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f2464ed76b550001943f72027e60afae65fa403a +Subproject commit 27f37c9cc16eaaf7b2b46b39ded1a415491489b8 From 0653392576252eddb932367bbf14c7049fc5b3d9 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 30 Aug 2025 17:12:51 +0300 Subject: [PATCH 263/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 27f37c9..ef8b785 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 27f37c9cc16eaaf7b2b46b39ded1a415491489b8 +Subproject commit ef8b785ac6a2995e563798de733aaf3fe733b6f4 From aee673d02eeb840893294ae2940ba85c84599f37 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 5 Sep 2025 22:07:25 +0300 Subject: [PATCH 264/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ef8b785..08161c9 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ef8b785ac6a2995e563798de733aaf3fe733b6f4 +Subproject commit 08161c9aad9c51c28a960ecf114fc8735688852f From a2c377f784d5248e8a66ca16306949cead80542b Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 5 Sep 2025 22:09:40 +0300 Subject: [PATCH 265/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 08161c9..aa140fd 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 08161c9aad9c51c28a960ecf114fc8735688852f +Subproject commit aa140fd4ec42ad134347470546eaad6ac4513705 From 32d834882ccf035b2a152f2c2f093fc92daaa25f Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 10 Sep 2025 16:09:11 +0300 Subject: [PATCH 266/266] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index aa140fd..53faaeb 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit aa140fd4ec42ad134347470546eaad6ac4513705 +Subproject commit 53faaeb396ecea652cbeaec93ec2c12975d909de