From 81696da681a8b69b6761d42a1b0a240d246d3215 Mon Sep 17 00:00:00 2001 From: Andrew Beltrano Date: Fri, 1 Dec 2023 10:25:26 -0700 Subject: [PATCH] Organize source by os. --- src/CMakeLists.txt | 7 +------ src/common/CMakeLists.txt | 7 +++++++ src/{ => common}/client/CMakeLists.txt | 0 src/{ => common}/client/Placeholder.cxx | 0 src/{ => common}/dotnet/CMakeLists.txt | 0 src/{ => common}/dotnet/NetRemote.sln | 0 src/{ => common}/dotnet/NetRemoteClient/NetRemoteClient.cs | 0 .../dotnet/NetRemoteClient/NetRemoteClient.csproj | 0 .../dotnet/NetRemoteClientUnitTest/GlobalUsings.cs | 0 .../NetRemoteClientUnitTest/NetRemoteClientUnitTest.csproj | 0 .../NetRemoteClientUnitTest/UnitTestNetRemoteClient.cs | 0 .../dotnet/NetRemoteService/NetRemoteService.csproj | 0 .../dotnet/NetRemoteService/NetRemoteService.csproj.user | 0 src/{ => common}/dotnet/NetRemoteService/Program.cs | 0 .../dotnet/NetRemoteService/Properties/launchSettings.json | 0 .../dotnet/NetRemoteService/Services/NetRemoteService.cs | 0 .../dotnet/NetRemoteService/appsettings.Development.json | 0 src/{ => common}/dotnet/NetRemoteService/appsettings.json | 0 src/{ => common}/server/CMakeLists.txt | 0 src/{ => common}/server/NetRemoteServer.cxx | 0 src/{ => common}/server/NetRemoteServerConfiguration.cxx | 0 .../include/microsoft/net/remote/NetRemoteServer.hxx | 0 .../microsoft/net/remote/NetRemoteServerConfiguration.hxx | 0 src/{ => common}/service/CMakeLists.txt | 0 src/{ => common}/service/NetRemoteService.cxx | 0 .../include/microsoft/net/remote/NetRemoteService.hxx | 0 src/{ => common}/shared/CMakeLists.txt | 0 src/{ => common}/shared/notstd/CMakeLists.txt | 0 .../shared/notstd/include/notstd/Exceptions.hxx | 0 src/{ => common}/shared/notstd/include/notstd/Utility.hxx | 0 src/{ => common}/shared/strings/CMakeLists.txt | 0 .../shared/strings/include/strings/StringHelpers.hxx | 0 src/{ => common}/wifi/CMakeLists.txt | 0 src/{ => common}/wifi/apmanager/AccessPointManager.cxx | 0 src/{ => common}/wifi/apmanager/CMakeLists.txt | 0 .../include/microsoft/net/wifi/AccessPointManager.hxx | 0 src/{ => common}/wifi/core/AccessPoint.cxx | 0 src/{ => common}/wifi/core/CMakeLists.txt | 0 .../wifi/core/include/microsoft/net/wifi/AccessPoint.hxx | 0 .../wifi/core/include/microsoft/net/wifi/IAccessPoint.hxx | 0 .../include/microsoft/net/wifi/IAccessPointFactory.hxx | 0 41 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 src/common/CMakeLists.txt rename src/{ => common}/client/CMakeLists.txt (100%) rename src/{ => common}/client/Placeholder.cxx (100%) rename src/{ => common}/dotnet/CMakeLists.txt (100%) rename src/{ => common}/dotnet/NetRemote.sln (100%) rename src/{ => common}/dotnet/NetRemoteClient/NetRemoteClient.cs (100%) rename src/{ => common}/dotnet/NetRemoteClient/NetRemoteClient.csproj (100%) rename src/{ => common}/dotnet/NetRemoteClientUnitTest/GlobalUsings.cs (100%) rename src/{ => common}/dotnet/NetRemoteClientUnitTest/NetRemoteClientUnitTest.csproj (100%) rename src/{ => common}/dotnet/NetRemoteClientUnitTest/UnitTestNetRemoteClient.cs (100%) rename src/{ => common}/dotnet/NetRemoteService/NetRemoteService.csproj (100%) rename src/{ => common}/dotnet/NetRemoteService/NetRemoteService.csproj.user (100%) rename src/{ => common}/dotnet/NetRemoteService/Program.cs (100%) rename src/{ => common}/dotnet/NetRemoteService/Properties/launchSettings.json (100%) rename src/{ => common}/dotnet/NetRemoteService/Services/NetRemoteService.cs (100%) rename src/{ => common}/dotnet/NetRemoteService/appsettings.Development.json (100%) rename src/{ => common}/dotnet/NetRemoteService/appsettings.json (100%) rename src/{ => common}/server/CMakeLists.txt (100%) rename src/{ => common}/server/NetRemoteServer.cxx (100%) rename src/{ => common}/server/NetRemoteServerConfiguration.cxx (100%) rename src/{ => common}/server/include/microsoft/net/remote/NetRemoteServer.hxx (100%) rename src/{ => common}/server/include/microsoft/net/remote/NetRemoteServerConfiguration.hxx (100%) rename src/{ => common}/service/CMakeLists.txt (100%) rename src/{ => common}/service/NetRemoteService.cxx (100%) rename src/{ => common}/service/include/microsoft/net/remote/NetRemoteService.hxx (100%) rename src/{ => common}/shared/CMakeLists.txt (100%) rename src/{ => common}/shared/notstd/CMakeLists.txt (100%) rename src/{ => common}/shared/notstd/include/notstd/Exceptions.hxx (100%) rename src/{ => common}/shared/notstd/include/notstd/Utility.hxx (100%) rename src/{ => common}/shared/strings/CMakeLists.txt (100%) rename src/{ => common}/shared/strings/include/strings/StringHelpers.hxx (100%) rename src/{ => common}/wifi/CMakeLists.txt (100%) rename src/{ => common}/wifi/apmanager/AccessPointManager.cxx (100%) rename src/{ => common}/wifi/apmanager/CMakeLists.txt (100%) rename src/{ => common}/wifi/apmanager/include/microsoft/net/wifi/AccessPointManager.hxx (100%) rename src/{ => common}/wifi/core/AccessPoint.cxx (100%) rename src/{ => common}/wifi/core/CMakeLists.txt (100%) rename src/{ => common}/wifi/core/include/microsoft/net/wifi/AccessPoint.hxx (100%) rename src/{ => common}/wifi/core/include/microsoft/net/wifi/IAccessPoint.hxx (100%) rename src/{ => common}/wifi/core/include/microsoft/net/wifi/IAccessPointFactory.hxx (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 92c6feb9..da07c476 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,10 +1,5 @@ -add_subdirectory(client) -add_subdirectory(dotnet) -add_subdirectory(server) -add_subdirectory(service) -add_subdirectory(shared) -add_subdirectory(wifi) +add_subdirectory(common) # Conditional inclusion of OS-dependent source trees. if (BUILD_FOR_LINUX) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt new file mode 100644 index 00000000..a173f938 --- /dev/null +++ b/src/common/CMakeLists.txt @@ -0,0 +1,7 @@ + +add_subdirectory(client) +add_subdirectory(dotnet) +add_subdirectory(server) +add_subdirectory(service) +add_subdirectory(shared) +add_subdirectory(wifi) diff --git a/src/client/CMakeLists.txt b/src/common/client/CMakeLists.txt similarity index 100% rename from src/client/CMakeLists.txt rename to src/common/client/CMakeLists.txt diff --git a/src/client/Placeholder.cxx b/src/common/client/Placeholder.cxx similarity index 100% rename from src/client/Placeholder.cxx rename to src/common/client/Placeholder.cxx diff --git a/src/dotnet/CMakeLists.txt b/src/common/dotnet/CMakeLists.txt similarity index 100% rename from src/dotnet/CMakeLists.txt rename to src/common/dotnet/CMakeLists.txt diff --git a/src/dotnet/NetRemote.sln b/src/common/dotnet/NetRemote.sln similarity index 100% rename from src/dotnet/NetRemote.sln rename to src/common/dotnet/NetRemote.sln diff --git a/src/dotnet/NetRemoteClient/NetRemoteClient.cs b/src/common/dotnet/NetRemoteClient/NetRemoteClient.cs similarity index 100% rename from src/dotnet/NetRemoteClient/NetRemoteClient.cs rename to src/common/dotnet/NetRemoteClient/NetRemoteClient.cs diff --git a/src/dotnet/NetRemoteClient/NetRemoteClient.csproj b/src/common/dotnet/NetRemoteClient/NetRemoteClient.csproj similarity index 100% rename from src/dotnet/NetRemoteClient/NetRemoteClient.csproj rename to src/common/dotnet/NetRemoteClient/NetRemoteClient.csproj diff --git a/src/dotnet/NetRemoteClientUnitTest/GlobalUsings.cs b/src/common/dotnet/NetRemoteClientUnitTest/GlobalUsings.cs similarity index 100% rename from src/dotnet/NetRemoteClientUnitTest/GlobalUsings.cs rename to src/common/dotnet/NetRemoteClientUnitTest/GlobalUsings.cs diff --git a/src/dotnet/NetRemoteClientUnitTest/NetRemoteClientUnitTest.csproj b/src/common/dotnet/NetRemoteClientUnitTest/NetRemoteClientUnitTest.csproj similarity index 100% rename from src/dotnet/NetRemoteClientUnitTest/NetRemoteClientUnitTest.csproj rename to src/common/dotnet/NetRemoteClientUnitTest/NetRemoteClientUnitTest.csproj diff --git a/src/dotnet/NetRemoteClientUnitTest/UnitTestNetRemoteClient.cs b/src/common/dotnet/NetRemoteClientUnitTest/UnitTestNetRemoteClient.cs similarity index 100% rename from src/dotnet/NetRemoteClientUnitTest/UnitTestNetRemoteClient.cs rename to src/common/dotnet/NetRemoteClientUnitTest/UnitTestNetRemoteClient.cs diff --git a/src/dotnet/NetRemoteService/NetRemoteService.csproj b/src/common/dotnet/NetRemoteService/NetRemoteService.csproj similarity index 100% rename from src/dotnet/NetRemoteService/NetRemoteService.csproj rename to src/common/dotnet/NetRemoteService/NetRemoteService.csproj diff --git a/src/dotnet/NetRemoteService/NetRemoteService.csproj.user b/src/common/dotnet/NetRemoteService/NetRemoteService.csproj.user similarity index 100% rename from src/dotnet/NetRemoteService/NetRemoteService.csproj.user rename to src/common/dotnet/NetRemoteService/NetRemoteService.csproj.user diff --git a/src/dotnet/NetRemoteService/Program.cs b/src/common/dotnet/NetRemoteService/Program.cs similarity index 100% rename from src/dotnet/NetRemoteService/Program.cs rename to src/common/dotnet/NetRemoteService/Program.cs diff --git a/src/dotnet/NetRemoteService/Properties/launchSettings.json b/src/common/dotnet/NetRemoteService/Properties/launchSettings.json similarity index 100% rename from src/dotnet/NetRemoteService/Properties/launchSettings.json rename to src/common/dotnet/NetRemoteService/Properties/launchSettings.json diff --git a/src/dotnet/NetRemoteService/Services/NetRemoteService.cs b/src/common/dotnet/NetRemoteService/Services/NetRemoteService.cs similarity index 100% rename from src/dotnet/NetRemoteService/Services/NetRemoteService.cs rename to src/common/dotnet/NetRemoteService/Services/NetRemoteService.cs diff --git a/src/dotnet/NetRemoteService/appsettings.Development.json b/src/common/dotnet/NetRemoteService/appsettings.Development.json similarity index 100% rename from src/dotnet/NetRemoteService/appsettings.Development.json rename to src/common/dotnet/NetRemoteService/appsettings.Development.json diff --git a/src/dotnet/NetRemoteService/appsettings.json b/src/common/dotnet/NetRemoteService/appsettings.json similarity index 100% rename from src/dotnet/NetRemoteService/appsettings.json rename to src/common/dotnet/NetRemoteService/appsettings.json diff --git a/src/server/CMakeLists.txt b/src/common/server/CMakeLists.txt similarity index 100% rename from src/server/CMakeLists.txt rename to src/common/server/CMakeLists.txt diff --git a/src/server/NetRemoteServer.cxx b/src/common/server/NetRemoteServer.cxx similarity index 100% rename from src/server/NetRemoteServer.cxx rename to src/common/server/NetRemoteServer.cxx diff --git a/src/server/NetRemoteServerConfiguration.cxx b/src/common/server/NetRemoteServerConfiguration.cxx similarity index 100% rename from src/server/NetRemoteServerConfiguration.cxx rename to src/common/server/NetRemoteServerConfiguration.cxx diff --git a/src/server/include/microsoft/net/remote/NetRemoteServer.hxx b/src/common/server/include/microsoft/net/remote/NetRemoteServer.hxx similarity index 100% rename from src/server/include/microsoft/net/remote/NetRemoteServer.hxx rename to src/common/server/include/microsoft/net/remote/NetRemoteServer.hxx diff --git a/src/server/include/microsoft/net/remote/NetRemoteServerConfiguration.hxx b/src/common/server/include/microsoft/net/remote/NetRemoteServerConfiguration.hxx similarity index 100% rename from src/server/include/microsoft/net/remote/NetRemoteServerConfiguration.hxx rename to src/common/server/include/microsoft/net/remote/NetRemoteServerConfiguration.hxx diff --git a/src/service/CMakeLists.txt b/src/common/service/CMakeLists.txt similarity index 100% rename from src/service/CMakeLists.txt rename to src/common/service/CMakeLists.txt diff --git a/src/service/NetRemoteService.cxx b/src/common/service/NetRemoteService.cxx similarity index 100% rename from src/service/NetRemoteService.cxx rename to src/common/service/NetRemoteService.cxx diff --git a/src/service/include/microsoft/net/remote/NetRemoteService.hxx b/src/common/service/include/microsoft/net/remote/NetRemoteService.hxx similarity index 100% rename from src/service/include/microsoft/net/remote/NetRemoteService.hxx rename to src/common/service/include/microsoft/net/remote/NetRemoteService.hxx diff --git a/src/shared/CMakeLists.txt b/src/common/shared/CMakeLists.txt similarity index 100% rename from src/shared/CMakeLists.txt rename to src/common/shared/CMakeLists.txt diff --git a/src/shared/notstd/CMakeLists.txt b/src/common/shared/notstd/CMakeLists.txt similarity index 100% rename from src/shared/notstd/CMakeLists.txt rename to src/common/shared/notstd/CMakeLists.txt diff --git a/src/shared/notstd/include/notstd/Exceptions.hxx b/src/common/shared/notstd/include/notstd/Exceptions.hxx similarity index 100% rename from src/shared/notstd/include/notstd/Exceptions.hxx rename to src/common/shared/notstd/include/notstd/Exceptions.hxx diff --git a/src/shared/notstd/include/notstd/Utility.hxx b/src/common/shared/notstd/include/notstd/Utility.hxx similarity index 100% rename from src/shared/notstd/include/notstd/Utility.hxx rename to src/common/shared/notstd/include/notstd/Utility.hxx diff --git a/src/shared/strings/CMakeLists.txt b/src/common/shared/strings/CMakeLists.txt similarity index 100% rename from src/shared/strings/CMakeLists.txt rename to src/common/shared/strings/CMakeLists.txt diff --git a/src/shared/strings/include/strings/StringHelpers.hxx b/src/common/shared/strings/include/strings/StringHelpers.hxx similarity index 100% rename from src/shared/strings/include/strings/StringHelpers.hxx rename to src/common/shared/strings/include/strings/StringHelpers.hxx diff --git a/src/wifi/CMakeLists.txt b/src/common/wifi/CMakeLists.txt similarity index 100% rename from src/wifi/CMakeLists.txt rename to src/common/wifi/CMakeLists.txt diff --git a/src/wifi/apmanager/AccessPointManager.cxx b/src/common/wifi/apmanager/AccessPointManager.cxx similarity index 100% rename from src/wifi/apmanager/AccessPointManager.cxx rename to src/common/wifi/apmanager/AccessPointManager.cxx diff --git a/src/wifi/apmanager/CMakeLists.txt b/src/common/wifi/apmanager/CMakeLists.txt similarity index 100% rename from src/wifi/apmanager/CMakeLists.txt rename to src/common/wifi/apmanager/CMakeLists.txt diff --git a/src/wifi/apmanager/include/microsoft/net/wifi/AccessPointManager.hxx b/src/common/wifi/apmanager/include/microsoft/net/wifi/AccessPointManager.hxx similarity index 100% rename from src/wifi/apmanager/include/microsoft/net/wifi/AccessPointManager.hxx rename to src/common/wifi/apmanager/include/microsoft/net/wifi/AccessPointManager.hxx diff --git a/src/wifi/core/AccessPoint.cxx b/src/common/wifi/core/AccessPoint.cxx similarity index 100% rename from src/wifi/core/AccessPoint.cxx rename to src/common/wifi/core/AccessPoint.cxx diff --git a/src/wifi/core/CMakeLists.txt b/src/common/wifi/core/CMakeLists.txt similarity index 100% rename from src/wifi/core/CMakeLists.txt rename to src/common/wifi/core/CMakeLists.txt diff --git a/src/wifi/core/include/microsoft/net/wifi/AccessPoint.hxx b/src/common/wifi/core/include/microsoft/net/wifi/AccessPoint.hxx similarity index 100% rename from src/wifi/core/include/microsoft/net/wifi/AccessPoint.hxx rename to src/common/wifi/core/include/microsoft/net/wifi/AccessPoint.hxx diff --git a/src/wifi/core/include/microsoft/net/wifi/IAccessPoint.hxx b/src/common/wifi/core/include/microsoft/net/wifi/IAccessPoint.hxx similarity index 100% rename from src/wifi/core/include/microsoft/net/wifi/IAccessPoint.hxx rename to src/common/wifi/core/include/microsoft/net/wifi/IAccessPoint.hxx diff --git a/src/wifi/core/include/microsoft/net/wifi/IAccessPointFactory.hxx b/src/common/wifi/core/include/microsoft/net/wifi/IAccessPointFactory.hxx similarity index 100% rename from src/wifi/core/include/microsoft/net/wifi/IAccessPointFactory.hxx rename to src/common/wifi/core/include/microsoft/net/wifi/IAccessPointFactory.hxx