Commit 1e51cfdb authored by Jan Kiene's avatar Jan Kiene
Browse files

handle for windows MSVC project files + cleanup

parent e0ad34a3

.gitlab-ci.yml

+13 −27
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ stages: 
  - sed -i ".bak" "s/^# \(CFLAGS += -Werror\)/\1/" Makefile

  - sed -i ".bak" "s/# \(set(CMAKE_C_FLAGS \"\${CMAKE_C_FLAGS} -Werror\")\)/\1/" CMakeLists.txt

  - sed -i ".bak" "s/# \(add_compile_options(\"\/WX\")\)/\1/" CMakeLists.txt

  - sed -i ".bak" "s/<TreatWarningAsError>false/<TreatWarningAsError>true/" Workspace_msvc/*.vcxproj



# ---------------------------------------------------------------

# Job templates
@@ -243,21 +244,6 @@ stages: 
    - if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi

    - cp -r scripts/testv/* $TESTV_DIR/



# template for build jobs to include the check for warnings

.build-job-with-check-for-warnings:

  extends: .build-job-linux

  stage: build

  allow_failure:

    exit_codes:

      - 123



.build-job-windows-with-check-for-warnings:

  extends: .build-job-windows

  stage: build

  allow_failure:

    exit_codes:

      - 123



# ---------------------------------------------------------------

# .pre jobs for setting up things

# ---------------------------------------------------------------
@@ -313,7 +299,7 @@ branch-is-up-to-date-with-main-post: 


build-codec-linux-make:

  extends:

    - .build-job-with-check-for-warnings

    - .build-job-linux

    - .rules-basis

  script:

    - *print-common-info
@@ -322,7 +308,7 @@ build-codec-linux-make: 


build-codec-linux-cmake:

  extends:

    - .build-job-with-check-for-warnings

    - .build-job-linux

    - .rules-basis

  script:

    - *print-common-info
@@ -346,7 +332,7 @@ build-codec-instrumented-linux: 
# make sure that the codec builds with msan, asan and usan

build-codec-sanitizers-linux:

  extends:

    - .build-job-with-check-for-warnings

    - .build-job-linux

    - .rules-basis

  script:

    - *print-common-info
@@ -355,7 +341,7 @@ build-codec-sanitizers-linux: 


build-codec-include-split-linux-make:

  extends:

    - .build-job-with-check-for-warnings

    - .build-job-linux

    - .rules-basis

  script:

    - *print-common-info
@@ -365,7 +351,7 @@ build-codec-include-split-linux-make: 


build-codec-include-split-linux-cmake:

  extends:

    - .build-job-with-check-for-warnings

    - .build-job-linux

    - .rules-basis

  script:

    - *print-common-info
@@ -379,21 +365,21 @@ build-codec-include-split-linux-cmake: 


build-codec-windows-cmake:

  extends:

    - .build-job-windows-with-check-for-warnings

    - .build-job-windows

    - .rules-basis

  script:

    - *print-common-info-windows

    - $winoutdata = $null

    - *activate-Werror

    - cmake -G "Visual Studio 15 2017" . -Bbuild

    - cmake --build build -j



build-codec-windows-include-split-cmake:

  extends:

    - .build-job-windows-with-check-for-warnings

    - .build-job-windows

    - .rules-basis

  script:

    - *print-common-info-windows

    - $winoutdata = $null

    - *activate-Werror

    - 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
@@ -402,13 +388,13 @@ build-codec-windows-include-split-cmake: 


build-codec-windows-msbuild:

  extends:

    - .build-job-windows-with-check-for-warnings

    - .build-job-windows

    - .rules-basis

  script:

    - *print-common-info-windows

    - $winoutdata = $null

    - *activate-Werror

    - py .\scripts\strip_split_rendering.py

    - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug | tee -variable winoutdata

    - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug



# ---------------------------------------------------------------

# Test jobs for merge requests

Workspace_msvc/decoder.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
      <DebugInformationFormat>OldStyle</DebugInformationFormat>

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>true</TreatWarningAsError>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -130,7 +130,7 @@ 
      <DebugInformationFormat />

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>true</TreatWarningAsError>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Workspace_msvc/encoder.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
      <DebugInformationFormat>OldStyle</DebugInformationFormat>

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>true</TreatWarningAsError>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -138,7 +138,7 @@ 
      <DebugInformationFormat />

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>true</TreatWarningAsError>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Workspace_msvc/lib_com.vcxproj

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
      <DebugInformationFormat>OldStyle</DebugInformationFormat>

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>true</TreatWarningAsError>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -110,7 +110,7 @@ 
      <DebugInformationFormat />

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>true</TreatWarningAsError>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Workspace_msvc/lib_debug.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
      <DebugInformationFormat>OldStyle</DebugInformationFormat>

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>true</TreatWarningAsError>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <Lib>

      <OutputFile>$(OutDir)$(TargetName).lib</OutputFile>
@@ -95,7 +95,7 @@ 
      <DebugInformationFormat />

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>true</TreatWarningAsError>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <Lib>

      <OutputFile>$(OutDir)$(TargetName).lib</OutputFile>