Verified Commit 380fa917 authored by Marc Vef's avatar Marc Vef
Browse files

Added c++17 support to clang-format + added verbose mode

parent 880a180d

.clang-format

+1 −1
Original line number Original line Diff line number Diff line
@@ -68,6 +68,6 @@ SpacesInCStyleCastParentheses: false 
SpacesInContainerLiterals: false

SpacesInContainerLiterals: false

SpacesInParentheses: false

SpacesInParentheses: false

SpacesInSquareBrackets: false

SpacesInSquareBrackets: false

Standard: c++14

Standard: c++17

TabWidth: 4

TabWidth: 4

UseTab: Never
 
UseTab: Never

.gitlab-ci.yml

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ image: gekkofs/gekkofs:build_env-0.8.0 
check format:

check format:

  stage: check format

  stage: check format

  script:

  script:

    - ${CI_PROJECT_DIR}/scripts/check_format.sh -s "${CI_PROJECT_DIR}/src" -i "${CI_PROJECT_DIR}/src"

    - ${CI_PROJECT_DIR}/scripts/check_format.sh -s "${CI_PROJECT_DIR}/src" -i "${CI_PROJECT_DIR}/src" -v





compile dependencies:

compile dependencies:

  stage: build deps

  stage: build deps

scripts/check_format.sh

+11 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ PROJECT_SRC="$(pwd)/src" 
PROJECT_INCLUDE="$(pwd)/include"

PROJECT_INCLUDE="$(pwd)/include"

RUN_FORMAT=false

RUN_FORMAT=false

CLANG_FORMAT_BIN=""

CLANG_FORMAT_BIN=""

VERBOSE=false





usage_short() {

usage_short() {

    echo "

    echo "
@@ -30,6 +31,7 @@ optional arguments: 
                        (default: looks for 'clang-format' or 'clang-format-10')

                        (default: looks for 'clang-format' or 'clang-format-10')

    -r, --run_format    run clang-formatter before formatting check

    -r, --run_format    run clang-formatter before formatting check

                        DISCLAIMER: FILES ARE MODIFIED IN PLACE!

                        DISCLAIMER: FILES ARE MODIFIED IN PLACE!

    -v, --verbose       shows the diff of all files

"

"

}

}
@@ -61,6 +63,10 @@ while [[ $# -gt 0 ]]; do 
        RUN_FORMAT=true

        RUN_FORMAT=true

        shift # past argument

        shift # past argument

        ;;

        ;;

    -v | --verbose)

        VERBOSE=true

        shift # past argument

        ;;

    -h | --help)

    -h | --help)

        help_msg

        help_msg

        exit

        exit
@@ -115,6 +121,11 @@ while IFS= read -r -d '' FILE; do 
        else

        else

            echo -n "$FILE "

            echo -n "$FILE "

            echo "$UNFORMATTED_LINES"

            echo "$UNFORMATTED_LINES"

            if [[ "$VERBOSE" == true ]]; then

                diff -u <(cat "$FILE") <($CLANG_FORMAT_BIN -style=file "$FILE")

                echo "_______________________________________________________"

            fi

            echo

            FAIL=true

            FAIL=true

        fi

        fi

    fi

    fi