Skip to content

Commit c80e438

Browse files
tremblaptremblap
authored
Merge pull request #416 from flucoma/pre-production
[release] 1.0.7
2 parents e748875 + 04b01ec commit c80e438

File tree

84 files changed

+31452
-5047
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+31452
-5047
lines changed

‎.clang-format‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
---
2+
Language: Cpp
3+
# BasedOnStyle: LLVM
4+
AccessModifierOffset: -2
5+
AlignAfterOpenBracket: Align
6+
AlignConsecutiveAssignments: false
7+
AlignConsecutiveDeclarations: true
8+
AlignEscapedNewlines: Right
9+
AlignOperands: true
10+
AlignTrailingComments: true
11+
AllowAllParametersOfDeclarationOnNextLine: true
12+
AllowShortBlocksOnASingleLine: true
13+
AllowShortCaseLabelsOnASingleLine: true
14+
AllowShortFunctionsOnASingleLine: All
15+
AllowShortIfStatementsOnASingleLine: true
16+
AllowShortLoopsOnASingleLine: true
17+
AlwaysBreakAfterDefinitionReturnType: None
18+
AlwaysBreakAfterReturnType: None
19+
AlwaysBreakBeforeMultilineStrings: false
20+
AlwaysBreakTemplateDeclarations: true
21+
BinPackArguments: true
22+
BinPackParameters: true
23+
BraceWrapping:
24+
AfterClass: true
25+
AfterControlStatement: true
26+
AfterEnum: false
27+
AfterFunction: true
28+
AfterNamespace: false
29+
AfterObjCDeclaration: false
30+
AfterStruct: true
31+
AfterUnion: true
32+
AfterExternBlock: false
33+
BeforeCatch: false
34+
BeforeElse: true
35+
IndentBraces: false
36+
SplitEmptyFunction: false
37+
SplitEmptyRecord: false
38+
SplitEmptyNamespace: false
39+
BreakBeforeBinaryOperators: None
40+
BreakBeforeBraces: Custom
41+
BreakBeforeInheritanceComma: false
42+
BreakBeforeTernaryOperators: true
43+
BreakConstructorInitializersBeforeComma: false
44+
BreakConstructorInitializers: BeforeColon
45+
BreakAfterJavaFieldAnnotations: false
46+
BreakStringLiterals: true
47+
ColumnLimit: 80
48+
CommentPragmas: '^ IWYU pragma:'
49+
CompactNamespaces: false
50+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
51+
ConstructorInitializerIndentWidth: 4
52+
ContinuationIndentWidth: 4
53+
Cpp11BracedListStyle: true
54+
DerivePointerAlignment: false
55+
DisableFormat: false
56+
ExperimentalAutoDetectBinPacking: false
57+
FixNamespaceComments: true
58+
ForEachMacros:
59+
- foreach
60+
- Q_FOREACH
61+
- BOOST_FOREACH
62+
IncludeBlocks: Merge
63+
# Try and group includes by 'locality'
64+
# We use "" with rel paths for headers in same repo
65+
# Headers in quotes wiht no relative path at top
66+
# Group ../ and ../../ with different priorities, so they get sorted separately
67+
# <> headers *with a folder break* likely not to be STL -> STL / systems headers last
68+
IncludeCategories:
69+
- Regex: '<.+/'
70+
Priority: 4
71+
- Regex: '"../../'
72+
Priority: 3
73+
- Regex: '../' #
74+
Priority: 2
75+
- Regex: '".+hpp"'
76+
Priority: 1
77+
IncludeIsMainRegex: '(Test)?$'
78+
IndentCaseLabels: false
79+
IndentPPDirectives: None
80+
IndentWidth: 2
81+
IndentWrappedFunctionNames: false
82+
JavaScriptQuotes: Leave
83+
JavaScriptWrapImports: true
84+
KeepEmptyLinesAtTheStartOfBlocks: true
85+
MacroBlockBegin: ''
86+
MacroBlockEnd: ''
87+
MaxEmptyLinesToKeep: 2
88+
NamespaceIndentation: None
89+
ObjCBinPackProtocolList: Auto
90+
ObjCBlockIndentWidth: 2
91+
ObjCSpaceAfterProperty: false
92+
ObjCSpaceBeforeProtocolList: true
93+
PenaltyBreakAssignment: 2
94+
PenaltyBreakBeforeFirstCallParameter: 19
95+
PenaltyBreakComment: 300
96+
PenaltyBreakFirstLessLess: 120
97+
PenaltyBreakString: 1000
98+
PenaltyExcessCharacter: 1000000
99+
PenaltyReturnTypeOnItsOwnLine: 60
100+
PointerAlignment: Left
101+
ReflowComments: true
102+
SortIncludes: true
103+
SortUsingDeclarations: true
104+
SpaceAfterCStyleCast: true
105+
SpaceAfterTemplateKeyword: true
106+
SpaceBeforeAssignmentOperators: true
107+
SpaceBeforeCtorInitializerColon: true
108+
SpaceBeforeInheritanceColon: true
109+
SpaceBeforeParens: ControlStatements
110+
SpaceBeforeRangeBasedForLoopColon: true
111+
SpaceInEmptyParentheses: false
112+
SpacesBeforeTrailingComments: 1
113+
SpacesInAngles: false
114+
SpacesInContainerLiterals: true
115+
SpacesInCStyleCastParentheses: false
116+
SpacesInParentheses: false
117+
SpacesInSquareBrackets: false
118+
Standard: Cpp11
119+
TabWidth: 8
120+
UseTab: Never
121+
...

‎.gitattributes‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
* text=auto
2+
3+
*.cmake text
4+
*.cpp text
5+
*.gitattributes text
6+
*.gitignore text
7+
*.hpp text
8+
*.in text
9+
*.js text
10+
*.maxhelp text
11+
*.maxpat text
12+
*.md text
13+
*.txt text
14+
*.xml text
15+
*.yml text
16+
17+
*.png binary

‎.github/workflows/nightly.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,32 +58,35 @@ jobs:
5858
- name: make parent folder
5959
run : mkdir -p "FluidCorpusManipulation"
6060

61-
- uses: actions/download-artifact@v2
61+
- uses: actions/download-artifact@v3
6262
with:
6363
name: macbuild
6464
path: "FluidCorpusManipulation"
6565

66-
- uses: actions/download-artifact@v2
66+
- uses: actions/download-artifact@v3
6767
with:
6868
name: winbuild
6969
path: "FluidCorpusManipulation/externals"
7070

7171
- name: zip
7272
run: zip -r FluCoMa-Max-nightly.zip "FluidCorpusManipulation"
7373

74-
- uses: dev-drprasad/[email protected].0
74+
- uses: dev-drprasad/[email protected].1
7575
with:
7676
delete_release: true # default: false
7777
tag_name: nightly # tag name to delete
7878
env:
7979
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8080

81-
- name: package and upload
82-
uses: softprops/action-gh-release@v1
81+
- name: create release
82+
uses: ncipollo/release-action@v1
8383
with:
8484
name: FluCoMa Max Nightly Release
85+
artifacts: "FluCoMa*"
8586
body: "This is a nightly build of the FluCoMa Max package. As such, be warned there may be bugs or other unexpected behaviour. The build hash is ${{ github.sha }}"
86-
files: FluCoMa*
87+
tag: nightly
8788
prerelease: true
88-
tag_name: nightly
8989
draft: false
90+
allowUpdates: true
91+
92+

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ jobs:
5757
- name: make parent folder
5858
run : mkdir -p "FluidCorpusManipulation"
5959

60-
- uses: actions/download-artifact@v2
60+
- uses: actions/download-artifact@v3
6161
with:
6262
name: macbuild
6363
path: "FluidCorpusManipulation"
6464

65-
- uses: actions/download-artifact@v2
65+
- uses: actions/download-artifact@v3
6666
with:
6767
name: winbuild
6868
path: "FluidCorpusManipulation/externals"

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Part of the Fluid Corpus Manipulation Project (http://www.flucoma.org/)
2-
# Copyright 2017-2019 University of Huddersfield.
2+
# Copyright University of Huddersfield.
33
# Licensed under the BSD-3 License.
44
# See license.md file in the project root for full license information.
55
# This project has received funding from the European Research Council (ERC)

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2017-2020 University of Huddersfield
3+
Copyright University of Huddersfield
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)