Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Actions] [Warning Reporting] Adding Warning Reporting to be built in Actions for Windows #1416

Merged
merged 26 commits into from
Dec 4, 2023
Merged

[Actions] [Warning Reporting] Adding Warning Reporting to be built in Actions for Windows #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5ba9ecf
Adding warning reporting project to be built in actions on Windows
VeithMetro Nov 21, 2023
c7ff630
Adding WarningReportingCategories.cpp to the core project file
VeithMetro Nov 21, 2023
42b8064
Adding an empty define of ANNOUNCE_WARNING for warning free builds
VeithMetro Nov 21, 2023
2b7e63e
Merge branch 'rdkcentral:master' into development/windows-system-headers
VeithMetro Nov 23, 2023
c420e90
Adding preprocessor define in the command line
VeithMetro Nov 23, 2023
e7113d2
Update Build Thunder on Windows.yml
VeithMetro Nov 23, 2023
2b1b889
Trying a different project name
VeithMetro Nov 23, 2023
3ce7f51
Adding a folder of core
VeithMetro Nov 23, 2023
42e712d
Changing the syntax to match Windows
VeithMetro Nov 23, 2023
a7c30e9
Adding bridge project to be build as well to see if it builds depende…
VeithMetro Nov 23, 2023
327b4a0
Adding $(DefineConstants) to make sure we are not clearing them while…
VeithMetro Nov 23, 2023
1cfe3dc
Trying to build just bridge
VeithMetro Nov 23, 2023
7118fae
Trying to build the whole solution with msbuild
VeithMetro Nov 23, 2023
606ead7
Trying a different approach with setting env variables and using deve…
VeithMetro Nov 24, 2023
a31fcb2
Merge branch 'development/windows-system-headers' of https://github.c…
VeithMetro Nov 24, 2023
65acf77
Building once again with devenv but setting env variable beforehand
VeithMetro Nov 24, 2023
6f41abc
Changing the name to be more generic since it can be used for more th…
VeithMetro Nov 24, 2023
9829912
Merge branch 'development/windows-system-headers' of https://github.c…
VeithMetro Nov 24, 2023
5f1f334
Preparing for a pull request, cleaning everything up
VeithMetro Nov 24, 2023
9ad6cce
Removing variables which are no longer needed
VeithMetro Nov 24, 2023
ba9d420
Adding props to enable setting the env variable in Visual Studio
VeithMetro Nov 24, 2023
f3331fa
Merge branch 'development/windows-system-headers' of https://github.c…
VeithMetro Nov 24, 2023
933c2f4
Making sure by default the macro value is empty to override the other…
VeithMetro Nov 24, 2023
bc85cc3
Adding a separate variable for console builds
VeithMetro Nov 24, 2023
34349c2
Using the new console variable since it was clashing with the Visual …
VeithMetro Nov 24, 2023
8a5ddd6
Merge branch 'master' into development/windows-system-headers
pwielders Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/Build Thunder on Windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ env:
comProcess: Thunder\Source\WPEProcess\comprocess.vcxproj
devEnv: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.com
solution: Thunder.sln
warningReporting: Thunder\Source\extensions\warningreporting\warningreporting.vcxproj

jobs:
Thunder:
Expand Down Expand Up @@ -120,8 +121,10 @@ jobs:
shell: cmd
run: >
cd ThunderOnWindows
&& set CoreConsole="__CORE_WARNING_REPORTING__"
&& "%devEnv%" /Build "${{matrix.type}}|x${{matrix.version}}" /Project "%bridge%" "%solution%"
&& "%devEnv%" /Build "${{matrix.type}}|x${{matrix.version}}" /Project "%comProcess%" "%solution%"
&& "%devEnv%" /Build "${{matrix.type}}|x${{matrix.version}}" /Project "%warningReporting%" "%solution%"

- name: Tar files
run: tar -czvf ${{matrix.type}}${{matrix.version}}.tar.gz artifacts
Expand Down
14 changes: 14 additions & 0 deletions Source/core/CoreDefault.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<CoreDefines />
</PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup />
<ItemGroup>
<BuildMacro Include="CoreDefines">
<Value>$(CoreDefines)</Value>
</BuildMacro>
</ItemGroup>
</Project>
14 changes: 14 additions & 0 deletions Source/core/CoreWarningReporting.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<CoreDefines>__CORE_WARNING_REPORTING__</CoreDefines>
</PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup />
<ItemGroup>
<BuildMacro Include="CoreDefines">
<Value>$(CoreDefines)</Value>
</BuildMacro>
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions Source/core/WarningReportingControl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@

#ifndef __CORE_WARNING_REPORTING__

#define ANNOUNCE_WARNING(CATEGORY)

#define REPORT_WARNING(CATEGORY, ...)

#define REPORT_WARNING_GLOBAL(CATEGORY, ...)
Expand Down
17 changes: 13 additions & 4 deletions Source/core/core.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
<ClCompile Include="Thread.cpp" />
<ClCompile Include="Time.cpp" />
<ClCompile Include="Trace.cpp" />
<ClCompile Include="WarningReportingCategories.cpp" />
<ClCompile Include="WarningReportingControl.cpp" />
<ClCompile Include="WorkerPool.cpp" />
<ClCompile Include="XGetopt.cpp" />
Expand Down Expand Up @@ -179,15 +180,23 @@
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="CoreWarningReporting.props" />
<Import Project="CoreDefault.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="CoreWarningReporting.props" />
<Import Project="CoreDefault.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="CoreWarningReporting.props" />
<Import Project="CoreDefault.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="CoreWarningReporting.props" />
<Import Project="CoreDefault.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand Down Expand Up @@ -216,7 +225,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>CORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);</PreprocessorDefinitions>
<PreprocessorDefinitions>$(CoreConsole);$(CoreDefines);CORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>
</AdditionalIncludeDirectories>
Expand All @@ -235,7 +244,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>CORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>$(CoreConsole);$(CoreDefines);CORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(WindowsPath)</AdditionalIncludeDirectories>
<UseStandardPreprocessor>true</UseStandardPreprocessor>
Expand All @@ -255,7 +264,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>CORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;IN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>$(CoreConsole);$(CoreDefines);CORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;IN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>
</AdditionalIncludeDirectories>
Expand All @@ -278,7 +287,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>CORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>$(CoreConsole);$(CoreDefines);CORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>
</AdditionalIncludeDirectories>
Expand Down
3 changes: 3 additions & 0 deletions Source/core/core.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,5 +365,8 @@
<ClCompile Include="Module.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="WarningReportingCategories.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>