Commit a563d9af authored by Jan Kiene's avatar Jan Kiene
Browse files

cleanup

parent 8c040f6d

.gitlab-ci.yml

+2 −5
Original line number Diff line number Diff line
@@ -352,9 +352,7 @@ build-codec-include-split-linux-make: 
    - .rules-basis

  script:

    - *print-common-info

    # activate split rendering define

    - sed -i.bak -e "s/\/\*\ *\(#define\ *SPLIT_REND_WITH_HEAD_ROT\ *\)\*\//\1/g" ./lib_com/options.h

    - git diff

    - *enable-split-rendering

    - make -j INCLUDE_SPLIT=1 2>&1 | tee $BUILD_OUTPUT

    # need to use the "|| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...<

    - ci/check_for_warnings.py $BUILD_OUTPUT || exit $?
@@ -365,7 +363,7 @@ build-codec-include-split-linux-cmake: 
    - .rules-basis

  script:

    - *print-common-info

    - sed -i.bak -e "s/\/\*\ *\(#define\ *SPLIT_REND_WITH_HEAD_ROT\ *\)\*\//\1/g" ./lib_com/options.h

    - *enable-split-rendering

    - mkdir build

    - cd build

    - cmake .. -DINCLUDE_SPLIT=1
@@ -397,7 +395,6 @@ build-codec-windows-include-split-cmake: 
    - get-content .\lib_com\options.h | %{$_ -replace "/\*#define[\s]*SPLIT_REND_WITH_HEAD_ROT[\s]*\*/", "#define SPLIT_REND_WITH_HEAD_ROT"} | set-content -Path ./options_patched.h

    - rm ./lib_com/options.h

    - mv ./options_patched.h ./lib_com/options.h

    - git diff

    - cmake -DINCLUDE_SPLIT=1 -G "Visual Studio 15 2017" . -Bbuild

    - cmake --build build -j | tee -variable winoutdata

    - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8