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

[WINDOWS] Make sure the new QA interfaces do not break the build. #350

Merged
merged 4 commits into from
May 23, 2024
Merged

[WINDOWS] Make sure the new QA interfaces do not break the build. #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
949473b
[WINDOWS] Make sure the new QA interfaces do not break the build.
pwielders May 23, 2024
9f18d87
Update Definitions.vcxproj
pwielders May 23, 2024
d0bf954
Update Definitions.vcxproj.filters
pwielders May 23, 2024
d98d03b
Merge branch 'master' into development/windows
pwielders May 23, 2024
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: 1 addition & 2 deletions definitions/Definitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
#include <interfaces/ISwitchBoard.h>
#include <interfaces/ISystemCommands.h>
#include <interfaces/ITextToSpeech.h>
#include <interfaces/ITestUtility.h>
#include <interfaces/ITimeSync.h>
#include <interfaces/ITimeZone.h>
#include <interfaces/IVoiceHandler.h>
Expand All @@ -94,7 +93,7 @@
#include <interfaces/IZigWave.h>
#include "ValuePoint.h"


#include <qa_interfaces/ITestUtility.h>
#include <qa_interfaces/ITestController.h>
#include <qa_interfaces/ITestAutomation.h>
#endif
Expand Down
10 changes: 1 addition & 9 deletions definitions/Definitions.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@
<ClCompile Include="..\interfaces\json\JsonEnum_Streamer.cpp" />
<ClCompile Include="..\interfaces\json\JsonEnum_SubsystemControl.cpp" />
<ClCompile Include="..\interfaces\json\JsonEnum_SystemCommands.cpp" />
<ClCompile Include="..\interfaces\json\JsonEnum_TestController.cpp" />
<ClCompile Include="..\interfaces\json\JsonEnum_TestUtility.cpp" />
<ClCompile Include="..\interfaces\json\JsonEnum_TimeSync.cpp" />
<ClCompile Include="..\interfaces\json\JsonEnum_TimeZone.cpp" />
<ClCompile Include="..\interfaces\json\JsonEnum_TraceControl.cpp" />
Expand Down Expand Up @@ -290,12 +288,6 @@
<CustomBuild Include="..\jsonrpc\SystemCommands.json">
<FileType>Document</FileType>
</CustomBuild>
<CustomBuild Include="..\qa_jsonrpc\TestController.json">
<FileType>Document</FileType>
</CustomBuild>
<CustomBuild Include="..\qa_jsonrpc\TestUtility.json">
<FileType>Document</FileType>
</CustomBuild>
<CustomBuild Include="..\jsonrpc\TimeSync.json">
<FileType>Document</FileType>
</CustomBuild>
Expand Down Expand Up @@ -612,4 +604,4 @@
<UserProperties _1_1_4jsonrpc_4Butler_1json__JsonSchema="&quot;" />
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>
14 changes: 1 addition & 13 deletions definitions/Definitions.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,6 @@
<ClCompile Include="..\interfaces\json\JsonEnum_SystemCommands.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="..\interfaces\json\JsonEnum_TestController.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="..\interfaces\json\JsonEnum_TestUtility.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="..\interfaces\json\JsonEnum_TimeSync.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -300,12 +294,6 @@
<CustomBuild Include="..\jsonrpc\SystemCommands.json">
<Filter>Contracts</Filter>
</CustomBuild>
<CustomBuild Include="..\qa_jsonrpc\TestController.json">
<Filter>Contracts</Filter>
</CustomBuild>
<CustomBuild Include="..\qa_jsonrpc\TestUtility.json">
<Filter>Contracts</Filter>
</CustomBuild>
<CustomBuild Include="..\jsonrpc\TimeSync.json">
<Filter>Contracts</Filter>
</CustomBuild>
Expand Down Expand Up @@ -349,4 +337,4 @@
<Filter>Interfaces</Filter>
</CustomBuild>
</ItemGroup>
</Project>
</Project>
3 changes: 0 additions & 3 deletions interfaces/Interfaces.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@
<ClCompile Include="proxystubs\ProxyStubs_Stream.cpp" />
<ClCompile Include="proxystubs\ProxyStubs_SwitchBoard.cpp" />
<ClCompile Include="proxystubs\ProxyStubs_SystemCommands.cpp" />
<ClCompile Include="proxystubs\ProxyStubs_TestController.cpp" />
<ClCompile Include="proxystubs\ProxyStubs_TestUtility.cpp" />
<ClCompile Include="proxystubs\ProxyStubs_TextToSpeech.cpp" />
<ClCompile Include="proxystubs\ProxyStubs_TimeSync.cpp" />
<ClCompile Include="proxystubs\ProxyStubs_TimeZone.cpp" />
Expand Down Expand Up @@ -151,7 +149,6 @@
<ClInclude Include="IStream.h" />
<ClInclude Include="ISwitchBoard.h" />
<ClInclude Include="ISystemCommands.h" />
<ClInclude Include="ITestController.h" />
<ClInclude Include="ITextToSpeech.h" />
<ClInclude Include="ITimeSync.h" />
<ClInclude Include="ITimeZone.h" />
Expand Down
9 changes: 0 additions & 9 deletions interfaces/Interfaces.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,6 @@
<ClCompile Include="proxystubs\ProxyStubs_SystemCommands.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="proxystubs\ProxyStubs_TestController.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="proxystubs\ProxyStubs_TestUtility.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="proxystubs\ProxyStubs_TextToSpeech.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -335,9 +329,6 @@
<ClInclude Include="ISystemCommands.h">
<Filter>Interface Files</Filter>
</ClInclude>
<ClInclude Include="ITestController.h">
<Filter>Interface Files</Filter>
</ClInclude>
<ClInclude Include="Ids.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down
Loading