64 Commits

Author SHA1 Message Date
fcbdf97c28 Merge pull request 'master' (#169) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/169
2023-03-14 19:48:22 +03:00
81a4234f6c pip, qglengine 2023-03-14 17:41:24 +03:00
34fa2bd375 cd pip 2023-03-14 10:38:29 +03:00
baacbb111d Merge pull request 'qglengine and cd' (#168) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/168
2023-03-07 19:25:33 +03:00
8273617121 Merge pull request 'qad' (#167) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/167
2023-03-07 18:19:24 +03:00
6cbae1187e qad 2023-03-07 18:19:09 +03:00
66572991ba qglengine and cd 2023-03-07 16:23:47 +03:00
a843251e07 Merge pull request 'qad' (#166) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/166
2023-03-07 11:05:49 +03:00
a3c80f5fd1 qad 2023-03-07 11:05:32 +03:00
c71b7b3ff2 Merge pull request 'qad' (#165) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/165
2023-03-06 19:54:01 +03:00
58f739f99b qad 2023-03-06 19:53:50 +03:00
5808a0d909 Merge pull request 'master' (#164) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/164
2023-03-06 19:37:46 +03:00
5c3b2740e1 pip, qad, qgle 2023-03-06 19:37:32 +03:00
10492b57b5 qad 2023-01-25 13:21:40 +03:00
4d2766b17f Merge pull request 'pip' (#163) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/163
2023-01-10 12:10:52 +03:00
84c7a86f34 pip 2023-01-10 12:10:43 +03:00
e9d039462e Merge pull request 'qad' (#162) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/162
2023-01-09 15:52:02 +03:00
9238b8bf1b qad 2023-01-09 15:51:55 +03:00
dec256e115 Merge pull request 'master' (#161) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/161
2023-01-09 15:43:56 +03:00
f6d4f9bbac pip, qad 2023-01-09 15:43:30 +03:00
1c1284caa0 .editorconfig, format, pivaluetree, pivaluetreeedit 2022-12-16 16:45:44 +03:00
9b0d5a0a75 add .clang-format file 2022-12-12 12:42:36 +03:00
e7755da10c pip,qad 2022-12-07 10:56:10 +03:00
cb0b515c31 Merge pull request 'master' (#160) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/160
2022-11-24 15:32:49 +03:00
038ce7476b qad 2022-11-24 15:29:41 +03:00
56fc061699 pip 2022-11-15 09:50:06 +03:00
c9fa22c838 Merge pull request 'pip' (#159) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/159
2022-11-12 13:38:26 +03:00
751c9370d7 pip 2022-11-12 13:38:12 +03:00
659a14aba8 Merge pull request 'pip, wad' (#158) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/158
2022-11-12 13:34:04 +03:00
4158c263e0 pip, wad 2022-11-12 13:31:50 +03:00
0bcd60b9db Merge pull request 'pip' (#157) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/157
2022-11-11 16:29:27 +03:00
87f7113057 pip 2022-11-11 16:29:10 +03:00
866188b663 Merge pull request 'pip' (#156) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/156
2022-11-10 19:37:20 +03:00
8871b29819 pip 2022-11-10 19:37:09 +03:00
c761fc3b28 Merge pull request 'pip, cd' (#155) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/155
2022-11-10 17:05:22 +03:00
4156c945c0 pip, cd 2022-11-10 16:17:08 +03:00
df6464d258 Merge pull request 'qad' (#154) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/154
2022-10-28 19:46:18 +03:00
b114935959 qad 2022-10-28 19:43:59 +03:00
c9a8c823a4 Merge pull request 'pip, qad' (#153) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/153
2022-10-28 13:44:17 +03:00
9b5ac6acaa pip, qad 2022-10-28 13:42:42 +03:00
5bda48df56 Merge pull request 'master' (#152) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/152
2022-10-26 21:17:57 +03:00
d22d4a56f6 Merge branch 'master' of https://git.shs.tools/SHS/shstk 2022-10-26 21:17:34 +03:00
f0f804a69b qglengine getImage 2022-10-26 21:17:30 +03:00
6b7bc54449 Merge pull request 'qglengine' (#151) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/151
2022-10-13 23:08:34 +03:00
1db79b7e60 qglengine 2022-10-13 23:08:23 +03:00
05edd4714c Merge pull request 'pip' (#150) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/150
2022-09-18 12:38:56 +03:00
0809ce5af6 pip 2022-09-18 12:36:19 +03:00
ce9bf3f209 pip 2022-09-18 12:33:56 +03:00
efeab7fc37 Merge pull request 'master' (#149) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/149
2022-08-11 11:44:34 +03:00
Бычков Андрей
4d72bec451 Merge branch 'release' of https://git.shs.tools/SHS/shstk 2022-08-11 11:43:48 +03:00
Бычков Андрей
a74f845cee pip 2022-08-11 11:41:59 +03:00
af9493cf67 ready to release 2022-08-10 23:44:40 +03:00
da1c314ad8 pip v3 2022-08-10 22:58:21 +03:00
4195aa9f52 update qad
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
2022-08-04 11:37:46 +03:00
Бычков Андрей
e57a2a6364 qad_types доработки, cmake bat
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
2022-06-30 17:56:55 +03:00
925e496561 pip
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
2022-06-24 16:44:53 +03:00
Бычков Андрей
9377c30c58 pip_cmg правки + gif record в graohic
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
2022-06-24 14:49:42 +03:00
Бычков Андрей
41dbad5921 fix Jenkinsfile 4
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
2022-06-09 17:23:49 +03:00
Бычков Андрей
e0f4935345 fix Jenkinsfile 3
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2022-06-09 17:13:45 +03:00
Бычков Андрей
bde2c85591 fix Jenkinsfile 2
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2022-06-09 17:12:51 +03:00
Бычков Анлрей
9fddb4445a fix Jenkinsfile
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2022-06-09 17:10:09 +03:00
Бычков Анлрей
9725423074 update cmake
Some checks failed
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
2022-06-09 17:00:04 +03:00
Бычков Анлрей
08446a58ba Merge branch 'release' of https://git.shs.tools/SHS/shstk into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2022-06-09 15:39:07 +03:00
Бычков Анлрей
6a26324d62 release branch for Dockerfile 2022-06-09 15:39:00 +03:00
11 changed files with 239 additions and 8 deletions

223
.clang-format Normal file
View File

@@ -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
...

6
.editorconfig Normal file
View File

@@ -0,0 +1,6 @@
root = true
[*.{h,c,cpp}]
charset = utf-8
indent_style = tab
tab_width = 4

2
Jenkinsfile vendored
View File

@@ -19,6 +19,7 @@ def build_docker(name, release_dir) {
}
return "\n - ${image_name}"
}
properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '20']], copyArtifactPermission('*')]);
node {
stage("checkout") {
checkout scm
@@ -49,3 +50,4 @@ node {
archiveArtifacts 'release/*'
echo "${_msg}"
}

2
cd

Submodule cd updated: 556191d443...24c69edb82

2
cmake

Submodule cmake updated: 7bca337d1f...8f898b103d

View File

@@ -6,7 +6,7 @@ ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft
RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
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 \

View File

@@ -6,7 +6,7 @@ ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft
RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
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 \

View File

@@ -6,7 +6,7 @@ ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft
RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
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 \

2
pip

Submodule pip updated: 8551499a5e...504fc5c896

2
qad

Submodule qad updated: cddc0b6d91...e9b995879a