Loading .clang-format +137 Changes for .clang-format: 137 added lines, 0 removed lines. Original line number Diff line number Diff line --- Language: Cpp # BasedOnStyle: LLVM AccessModifierOffset: -2 AlignAfterOpenBracket: Align AlignConsecutiveMacros: false AlignConsecutiveAssignments: false AlignConsecutiveDeclarations: false AlignEscapedNewlines: Right AlignOperands: true AlignTrailingComments: true AllowAllArgumentsOnNextLine: true AllowAllConstructorInitializersOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true AllowShortBlocksOnASingleLine: Never AllowShortCaseLabelsOnASingleLine: false AllowShortFunctionsOnASingleLine: All AllowShortLambdasOnASingleLine: All AllowShortIfStatementsOnASingleLine: Never AllowShortLoopsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: false AlwaysBreakTemplateDeclarations: MultiLine BinPackArguments: true BinPackParameters: true BraceWrapping: AfterCaseLabel: false AfterClass: false AfterControlStatement: false AfterEnum: false AfterFunction: false AfterNamespace: false AfterObjCDeclaration: false AfterStruct: false AfterUnion: false AfterExternBlock: false BeforeCatch: false BeforeElse: false IndentBraces: false SplitEmptyFunction: true SplitEmptyRecord: true SplitEmptyNamespace: true BreakBeforeBinaryOperators: None BreakBeforeBraces: Attach BreakBeforeInheritanceComma: false BreakInheritanceList: BeforeColon BreakBeforeTernaryOperators: true BreakConstructorInitializersBeforeComma: false BreakConstructorInitializers: BeforeColon BreakAfterJavaFieldAnnotations: false BreakStringLiterals: true ColumnLimit: 80 CommentPragmas: '^ IWYU pragma:' CompactNamespaces: false ConstructorInitializerAllOnOneLineOrOnePerLine: false ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 Cpp11BracedListStyle: true DeriveLineEnding: true DerivePointerAlignment: false DisableFormat: false ExperimentalAutoDetectBinPacking: false FixNamespaceComments: true ForEachMacros: - foreach - Q_FOREACH - BOOST_FOREACH IncludeBlocks: Preserve IncludeCategories: - Regex: '^"(llvm|llvm-c|clang|clang-c)/' Priority: 2 SortPriority: 0 - Regex: '^(<|"(gtest|gmock|isl|json)/)' Priority: 3 SortPriority: 0 - Regex: '.*' Priority: 1 SortPriority: 0 IncludeIsMainRegex: '(Test)?$' IncludeIsMainSourceRegex: '' IndentCaseLabels: false IndentGotoLabels: true IndentPPDirectives: None IndentWidth: 2 IndentWrappedFunctionNames: false JavaScriptQuotes: Leave JavaScriptWrapImports: true KeepEmptyLinesAtTheStartOfBlocks: true MacroBlockBegin: '' MacroBlockEnd: '' MaxEmptyLinesToKeep: 1 NamespaceIndentation: None ObjCBinPackProtocolList: Auto ObjCBlockIndentWidth: 2 ObjCSpaceAfterProperty: false ObjCSpaceBeforeProtocolList: true PenaltyBreakAssignment: 2 PenaltyBreakBeforeFirstCallParameter: 19 PenaltyBreakComment: 300 PenaltyBreakFirstLessLess: 120 PenaltyBreakString: 1000 PenaltyBreakTemplateDeclaration: 10 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Right ReflowComments: true SortIncludes: true SortUsingDeclarations: true SpaceAfterCStyleCast: false SpaceAfterLogicalNot: false SpaceAfterTemplateKeyword: true SpaceBeforeAssignmentOperators: true SpaceBeforeCpp11BracedList: false SpaceBeforeCtorInitializerColon: true SpaceBeforeInheritanceColon: true SpaceBeforeParens: ControlStatements SpaceBeforeRangeBasedForLoopColon: true SpaceInEmptyBlock: false SpaceInEmptyParentheses: false SpacesBeforeTrailingComments: 1 SpacesInAngles: false SpacesInConditionalStatement: false SpacesInContainerLiterals: true SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false SpaceBeforeSquareBrackets: false Standard: Latest StatementMacros: - Q_UNUSED - QT_REQUIRE_VERSION TabWidth: 8 UseCRLF: false UseTab: Never ... .gitlab-ci.yml +1 −1 Changes for .gitlab-ci.yml: 1 added line, 1 removed line. Original line number Diff line number Diff line image: python:3.8.6 image: hello-world:latest stages: - build-img Loading CMakeLists.txt −10 Changes for CMakeLists.txt: 0 added lines, 10 removed lines. Original line number Diff line number Diff line Loading @@ -15,20 +15,10 @@ if(CCACHE_FOUND) set( CMAKE_CXX_COMPILER_LAUNCHER ccache ) endif() find_program(CONAN_FOUND conan) if(CONAN_FOUND) message(STATUS "Using conan found at: ${CONAN_FOUND}") include(conan.cmake) conan_cmake_run(CONANFILE conanfile.py BASIC_SETUP CMAKE_TARGETS) else() message(WARNING "Did not find conan in PATH. Will try download it with PMM <https://github.com/vector-of-bool/pmm>") message(WARNING "Recommend installing Conan with 'pip install conan' <https://conan.io/downloads.html> for faster builds") include(pmm.cmake) pmm(CONAN) conan_basic_setup() include(${CMAKE_CURRENT_BINARY_DIR}/conanbuildinfo.cmake) endif() include(CTest) include(Catch) Loading Dockerfile +17 −2 Changes for Dockerfile: 17 added lines, 2 removed lines. Original line number Diff line number Diff line # Docker Image for running csg-eb tests FROM python:3.8.7 FROM ubuntu:20.04 LABEL maintainer="Mark Meredith <mark.meredith@netl.doe.gov>" RUN pip install cmake==3.18.4 conan==1.32.1 ninja==1.10.0.post2 ENV DEBIAN_FRONTEND noninteractive RUN apt-get -qq update \ && apt-get -qq -y install --no-install-recommends \ build-essential=12.8ubuntu1.1 \ git=1:2.25.1-1ubuntu3 \ ninja-build=1.10.0-1build1 \ openscad=2019.05-3ubuntu5 \ pkg-config=0.29.1-0ubuntu4 \ python3-pip=20.0.2-5ubuntu1.1 \ python3-venv=3.8.2-0ubuntu2 \ && apt-get clean && rm -rf /var/lib/apt/lists/* RUN pip3 install --no-cache-dir \ cmake==3.18.4.post1 \ conan==1.34.0 CMD [ "/bin/bash" ] conan.cmake −673 File deleted.Preview size limit exceeded, changes collapsed. Show changes Loading
.clang-format +137 Changes for .clang-format: 137 added lines, 0 removed lines. Original line number Diff line number Diff line --- Language: Cpp # BasedOnStyle: LLVM AccessModifierOffset: -2 AlignAfterOpenBracket: Align AlignConsecutiveMacros: false AlignConsecutiveAssignments: false AlignConsecutiveDeclarations: false AlignEscapedNewlines: Right AlignOperands: true AlignTrailingComments: true AllowAllArgumentsOnNextLine: true AllowAllConstructorInitializersOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true AllowShortBlocksOnASingleLine: Never AllowShortCaseLabelsOnASingleLine: false AllowShortFunctionsOnASingleLine: All AllowShortLambdasOnASingleLine: All AllowShortIfStatementsOnASingleLine: Never AllowShortLoopsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: false AlwaysBreakTemplateDeclarations: MultiLine BinPackArguments: true BinPackParameters: true BraceWrapping: AfterCaseLabel: false AfterClass: false AfterControlStatement: false AfterEnum: false AfterFunction: false AfterNamespace: false AfterObjCDeclaration: false AfterStruct: false AfterUnion: false AfterExternBlock: false BeforeCatch: false BeforeElse: false IndentBraces: false SplitEmptyFunction: true SplitEmptyRecord: true SplitEmptyNamespace: true BreakBeforeBinaryOperators: None BreakBeforeBraces: Attach BreakBeforeInheritanceComma: false BreakInheritanceList: BeforeColon BreakBeforeTernaryOperators: true BreakConstructorInitializersBeforeComma: false BreakConstructorInitializers: BeforeColon BreakAfterJavaFieldAnnotations: false BreakStringLiterals: true ColumnLimit: 80 CommentPragmas: '^ IWYU pragma:' CompactNamespaces: false ConstructorInitializerAllOnOneLineOrOnePerLine: false ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 Cpp11BracedListStyle: true DeriveLineEnding: true DerivePointerAlignment: false DisableFormat: false ExperimentalAutoDetectBinPacking: false FixNamespaceComments: true ForEachMacros: - foreach - Q_FOREACH - BOOST_FOREACH IncludeBlocks: Preserve IncludeCategories: - Regex: '^"(llvm|llvm-c|clang|clang-c)/' Priority: 2 SortPriority: 0 - Regex: '^(<|"(gtest|gmock|isl|json)/)' Priority: 3 SortPriority: 0 - Regex: '.*' Priority: 1 SortPriority: 0 IncludeIsMainRegex: '(Test)?$' IncludeIsMainSourceRegex: '' IndentCaseLabels: false IndentGotoLabels: true IndentPPDirectives: None IndentWidth: 2 IndentWrappedFunctionNames: false JavaScriptQuotes: Leave JavaScriptWrapImports: true KeepEmptyLinesAtTheStartOfBlocks: true MacroBlockBegin: '' MacroBlockEnd: '' MaxEmptyLinesToKeep: 1 NamespaceIndentation: None ObjCBinPackProtocolList: Auto ObjCBlockIndentWidth: 2 ObjCSpaceAfterProperty: false ObjCSpaceBeforeProtocolList: true PenaltyBreakAssignment: 2 PenaltyBreakBeforeFirstCallParameter: 19 PenaltyBreakComment: 300 PenaltyBreakFirstLessLess: 120 PenaltyBreakString: 1000 PenaltyBreakTemplateDeclaration: 10 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Right ReflowComments: true SortIncludes: true SortUsingDeclarations: true SpaceAfterCStyleCast: false SpaceAfterLogicalNot: false SpaceAfterTemplateKeyword: true SpaceBeforeAssignmentOperators: true SpaceBeforeCpp11BracedList: false SpaceBeforeCtorInitializerColon: true SpaceBeforeInheritanceColon: true SpaceBeforeParens: ControlStatements SpaceBeforeRangeBasedForLoopColon: true SpaceInEmptyBlock: false SpaceInEmptyParentheses: false SpacesBeforeTrailingComments: 1 SpacesInAngles: false SpacesInConditionalStatement: false SpacesInContainerLiterals: true SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false SpaceBeforeSquareBrackets: false Standard: Latest StatementMacros: - Q_UNUSED - QT_REQUIRE_VERSION TabWidth: 8 UseCRLF: false UseTab: Never ...
.gitlab-ci.yml +1 −1 Changes for .gitlab-ci.yml: 1 added line, 1 removed line. Original line number Diff line number Diff line image: python:3.8.6 image: hello-world:latest stages: - build-img Loading
CMakeLists.txt −10 Changes for CMakeLists.txt: 0 added lines, 10 removed lines. Original line number Diff line number Diff line Loading @@ -15,20 +15,10 @@ if(CCACHE_FOUND) set( CMAKE_CXX_COMPILER_LAUNCHER ccache ) endif() find_program(CONAN_FOUND conan) if(CONAN_FOUND) message(STATUS "Using conan found at: ${CONAN_FOUND}") include(conan.cmake) conan_cmake_run(CONANFILE conanfile.py BASIC_SETUP CMAKE_TARGETS) else() message(WARNING "Did not find conan in PATH. Will try download it with PMM <https://github.com/vector-of-bool/pmm>") message(WARNING "Recommend installing Conan with 'pip install conan' <https://conan.io/downloads.html> for faster builds") include(pmm.cmake) pmm(CONAN) conan_basic_setup() include(${CMAKE_CURRENT_BINARY_DIR}/conanbuildinfo.cmake) endif() include(CTest) include(Catch) Loading
Dockerfile +17 −2 Changes for Dockerfile: 17 added lines, 2 removed lines. Original line number Diff line number Diff line # Docker Image for running csg-eb tests FROM python:3.8.7 FROM ubuntu:20.04 LABEL maintainer="Mark Meredith <mark.meredith@netl.doe.gov>" RUN pip install cmake==3.18.4 conan==1.32.1 ninja==1.10.0.post2 ENV DEBIAN_FRONTEND noninteractive RUN apt-get -qq update \ && apt-get -qq -y install --no-install-recommends \ build-essential=12.8ubuntu1.1 \ git=1:2.25.1-1ubuntu3 \ ninja-build=1.10.0-1build1 \ openscad=2019.05-3ubuntu5 \ pkg-config=0.29.1-0ubuntu4 \ python3-pip=20.0.2-5ubuntu1.1 \ python3-venv=3.8.2-0ubuntu2 \ && apt-get clean && rm -rf /var/lib/apt/lists/* RUN pip3 install --no-cache-dir \ cmake==3.18.4.post1 \ conan==1.34.0 CMD [ "/bin/bash" ]