diff options
| author | Stefan Boberg <[email protected]> | 2021-09-09 15:14:08 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-09 15:14:08 +0200 |
| commit | 6ec26c46d694a1d5291790a9c70bec25dce4b513 (patch) | |
| tree | 4177d45f9703d11f00e495f0fde77f4445453d2d | |
| parent | HttpServer::AddEndpoint -> HttpServer::RegisterService (diff) | |
| download | zen-6ec26c46d694a1d5291790a9c70bec25dce4b513.tar.xz zen-6ec26c46d694a1d5291790a9c70bec25dce4b513.zip | |
Factored out http server related code into zenhttp module since it feels out of place in zencore
31 files changed, 207 insertions, 36 deletions
@@ -49,6 +49,7 @@ set_languages("cxx20") set_symbols("debug") includes("zencore", "zencore-test") +includes("zenhttp") includes("zenstore", "zenutil") includes("zenserver", "zenserver-test") includes("zen") @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28315.86 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31612.314 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{4EA55E5B-18A1-4E66-B821-44575BC11EA7}" ProjectSection(SolutionItems) = preProject @@ -45,44 +45,72 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zenutil", "zenutil\zenutil. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zentest-appstub", "zentest-appstub\zentest-appstub.vcxproj", "{7FFC7E77-D038-44E9-8D84-41918C355F29}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zenhttp", "zenhttp\zenhttp.vcxproj", "{8EEB3BE5-7001-46BF-AAFD-EDB7558AC012}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {D75BF9AB-C61E-4FFF-AD59-1563430F05E2}.Debug|x64.ActiveCfg = Debug|x64 {D75BF9AB-C61E-4FFF-AD59-1563430F05E2}.Debug|x64.Build.0 = Debug|x64 + {D75BF9AB-C61E-4FFF-AD59-1563430F05E2}.Debug|x86.ActiveCfg = Debug|x64 {D75BF9AB-C61E-4FFF-AD59-1563430F05E2}.Release|x64.ActiveCfg = Release|x64 {D75BF9AB-C61E-4FFF-AD59-1563430F05E2}.Release|x64.Build.0 = Release|x64 + {D75BF9AB-C61E-4FFF-AD59-1563430F05E2}.Release|x86.ActiveCfg = Release|x64 {C00173DF-B76E-4989-B576-FE2B780B2580}.Debug|x64.ActiveCfg = Debug|x64 {C00173DF-B76E-4989-B576-FE2B780B2580}.Debug|x64.Build.0 = Debug|x64 + {C00173DF-B76E-4989-B576-FE2B780B2580}.Debug|x86.ActiveCfg = Debug|x64 {C00173DF-B76E-4989-B576-FE2B780B2580}.Release|x64.ActiveCfg = Release|x64 {C00173DF-B76E-4989-B576-FE2B780B2580}.Release|x64.Build.0 = Release|x64 + {C00173DF-B76E-4989-B576-FE2B780B2580}.Release|x86.ActiveCfg = Release|x64 {8398D81C-B1B6-4327-82B1-06EACB8A144F}.Debug|x64.ActiveCfg = Debug|x64 {8398D81C-B1B6-4327-82B1-06EACB8A144F}.Debug|x64.Build.0 = Debug|x64 + {8398D81C-B1B6-4327-82B1-06EACB8A144F}.Debug|x86.ActiveCfg = Debug|x64 {8398D81C-B1B6-4327-82B1-06EACB8A144F}.Release|x64.ActiveCfg = Release|x64 {8398D81C-B1B6-4327-82B1-06EACB8A144F}.Release|x64.Build.0 = Release|x64 + {8398D81C-B1B6-4327-82B1-06EACB8A144F}.Release|x86.ActiveCfg = Release|x64 {CA7B9E04-A2D3-4A39-A7D7-FB156A2C6A48}.Debug|x64.ActiveCfg = Debug|x64 {CA7B9E04-A2D3-4A39-A7D7-FB156A2C6A48}.Debug|x64.Build.0 = Debug|x64 + {CA7B9E04-A2D3-4A39-A7D7-FB156A2C6A48}.Debug|x86.ActiveCfg = Debug|x64 {CA7B9E04-A2D3-4A39-A7D7-FB156A2C6A48}.Release|x64.ActiveCfg = Release|x64 {CA7B9E04-A2D3-4A39-A7D7-FB156A2C6A48}.Release|x64.Build.0 = Release|x64 + {CA7B9E04-A2D3-4A39-A7D7-FB156A2C6A48}.Release|x86.ActiveCfg = Release|x64 {2563249E-E695-4CC4-8FFA-335D07680C9D}.Debug|x64.ActiveCfg = Debug|x64 {2563249E-E695-4CC4-8FFA-335D07680C9D}.Debug|x64.Build.0 = Debug|x64 + {2563249E-E695-4CC4-8FFA-335D07680C9D}.Debug|x86.ActiveCfg = Debug|x64 {2563249E-E695-4CC4-8FFA-335D07680C9D}.Release|x64.ActiveCfg = Release|x64 {2563249E-E695-4CC4-8FFA-335D07680C9D}.Release|x64.Build.0 = Release|x64 + {2563249E-E695-4CC4-8FFA-335D07680C9D}.Release|x86.ActiveCfg = Release|x64 {26CBBAEB-14C1-4EFC-877D-80F48215651C}.Debug|x64.ActiveCfg = Debug|x64 {26CBBAEB-14C1-4EFC-877D-80F48215651C}.Debug|x64.Build.0 = Debug|x64 + {26CBBAEB-14C1-4EFC-877D-80F48215651C}.Debug|x86.ActiveCfg = Debug|x64 {26CBBAEB-14C1-4EFC-877D-80F48215651C}.Release|x64.ActiveCfg = Release|x64 {26CBBAEB-14C1-4EFC-877D-80F48215651C}.Release|x64.Build.0 = Release|x64 + {26CBBAEB-14C1-4EFC-877D-80F48215651C}.Release|x86.ActiveCfg = Release|x64 {77F8315D-B21D-4DB0-9A6F-2D3359F88A70}.Debug|x64.ActiveCfg = Debug|x64 {77F8315D-B21D-4DB0-9A6F-2D3359F88A70}.Debug|x64.Build.0 = Debug|x64 + {77F8315D-B21D-4DB0-9A6F-2D3359F88A70}.Debug|x86.ActiveCfg = Debug|x64 {77F8315D-B21D-4DB0-9A6F-2D3359F88A70}.Release|x64.ActiveCfg = Release|x64 {77F8315D-B21D-4DB0-9A6F-2D3359F88A70}.Release|x64.Build.0 = Release|x64 + {77F8315D-B21D-4DB0-9A6F-2D3359F88A70}.Release|x86.ActiveCfg = Release|x64 {7FFC7E77-D038-44E9-8D84-41918C355F29}.Debug|x64.ActiveCfg = Debug|x64 {7FFC7E77-D038-44E9-8D84-41918C355F29}.Debug|x64.Build.0 = Debug|x64 + {7FFC7E77-D038-44E9-8D84-41918C355F29}.Debug|x86.ActiveCfg = Debug|Win32 + {7FFC7E77-D038-44E9-8D84-41918C355F29}.Debug|x86.Build.0 = Debug|Win32 {7FFC7E77-D038-44E9-8D84-41918C355F29}.Release|x64.ActiveCfg = Release|x64 {7FFC7E77-D038-44E9-8D84-41918C355F29}.Release|x64.Build.0 = Release|x64 + {7FFC7E77-D038-44E9-8D84-41918C355F29}.Release|x86.ActiveCfg = Release|Win32 + {7FFC7E77-D038-44E9-8D84-41918C355F29}.Release|x86.Build.0 = Release|Win32 + {8EEB3BE5-7001-46BF-AAFD-EDB7558AC012}.Debug|x64.ActiveCfg = Debug|x64 + {8EEB3BE5-7001-46BF-AAFD-EDB7558AC012}.Debug|x64.Build.0 = Debug|x64 + {8EEB3BE5-7001-46BF-AAFD-EDB7558AC012}.Debug|x86.ActiveCfg = Debug|x64 + {8EEB3BE5-7001-46BF-AAFD-EDB7558AC012}.Release|x64.ActiveCfg = Release|x64 + {8EEB3BE5-7001-46BF-AAFD-EDB7558AC012}.Release|x64.Build.0 = Release|x64 + {8EEB3BE5-7001-46BF-AAFD-EDB7558AC012}.Release|x86.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/zencore/zencore.vcxproj b/zencore/zencore.vcxproj index ef83e95f1..4b5bba185 100644 --- a/zencore/zencore.vcxproj +++ b/zencore/zencore.vcxproj @@ -112,7 +112,6 @@ </Lib> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="httpsys.h" /> <ClInclude Include="include\zencore\atomic.h" /> <ClInclude Include="include\zencore\blake3.h" /> <ClInclude Include="include\zencore\compositebuffer.h" /> @@ -123,8 +122,6 @@ <ClInclude Include="include\zencore\compress.h" /> <ClInclude Include="include\zencore\filesystem.h" /> <ClInclude Include="include\zencore\fmtutils.h" /> - <ClInclude Include="include\zencore\httpclient.h" /> - <ClInclude Include="include\zencore\httpserver.h" /> <ClInclude Include="include\zencore\intmath.h" /> <ClInclude Include="include\zencore\iohash.h" /> <ClInclude Include="include\zencore\logging.h" /> @@ -155,7 +152,6 @@ <ClInclude Include="include\zencore\windows.h" /> <ClInclude Include="include\zencore\xxhash.h" /> <ClInclude Include="include\zencore\zencore.h" /> - <ClInclude Include="iothreadpool.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="blake3.cpp" /> @@ -164,11 +160,7 @@ <ClCompile Include="crc32.cpp" /> <ClCompile Include="except.cpp" /> <ClCompile Include="filesystem.cpp" /> - <ClCompile Include="httpclient.cpp" /> - <ClCompile Include="httpserver.cpp" /> - <ClCompile Include="httpsys.cpp" /> <ClCompile Include="iohash.cpp" /> - <ClCompile Include="iothreadpool.cpp" /> <ClCompile Include="logging.cpp" /> <ClCompile Include="md5.cpp" /> <ClCompile Include="memory.cpp" /> diff --git a/zencore/zencore.vcxproj.filters b/zencore/zencore.vcxproj.filters index 519ee0ce1..70c1cfb01 100644 --- a/zencore/zencore.vcxproj.filters +++ b/zencore/zencore.vcxproj.filters @@ -21,7 +21,6 @@ <ClInclude Include="include\zencore\enumflags.h" /> <ClInclude Include="include\zencore\except.h" /> <ClInclude Include="include\zencore\filesystem.h" /> - <ClInclude Include="include\zencore\httpserver.h" /> <ClInclude Include="include\zencore\refcount.h" /> <ClInclude Include="include\zencore\memory.h" /> <ClInclude Include="include\zencore\windows.h" /> @@ -31,11 +30,9 @@ <ClInclude Include="include\zencore\compactbinarybuilder.h" /> <ClInclude Include="include\zencore\compactbinarypackage.h" /> <ClInclude Include="include\zencore\compactbinaryvalidation.h" /> - <ClInclude Include="include\zencore\httpclient.h" /> <ClInclude Include="include\zencore\md5.h" /> <ClInclude Include="include\zencore\fmtutils.h" /> <ClInclude Include="include\zencore\xxhash.h" /> - <ClInclude Include="iothreadpool.h" /> <ClInclude Include="include\zencore\varint.h" /> <ClInclude Include="include\zencore\endian.h" /> <ClInclude Include="include\zencore\compositebuffer.h" /> @@ -44,7 +41,6 @@ <ClInclude Include="include\zencore\prewindows.h" /> <ClInclude Include="include\zencore\postwindows.h" /> <ClInclude Include="include\zencore\logging.h" /> - <ClInclude Include="httpsys.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="snapshot_manifest.cpp" /> @@ -54,7 +50,6 @@ <ClCompile Include="uid.cpp" /> <ClCompile Include="blake3.cpp" /> <ClCompile Include="filesystem.cpp" /> - <ClCompile Include="httpserver.cpp" /> <ClCompile Include="memory.cpp" /> <ClCompile Include="refcount.cpp" /> <ClCompile Include="stats.cpp" /> @@ -69,16 +64,13 @@ <ClCompile Include="compactbinarybuilder.cpp" /> <ClCompile Include="compactbinarypackage.cpp" /> <ClCompile Include="compactbinaryvalidation.cpp" /> - <ClCompile Include="httpclient.cpp" /> <ClCompile Include="md5.cpp" /> <ClCompile Include="except.cpp" /> <ClCompile Include="xxhash.cpp" /> - <ClCompile Include="iothreadpool.cpp" /> <ClCompile Include="compress.cpp" /> <ClCompile Include="compositebuffer.cpp" /> <ClCompile Include="crc32.cpp" /> <ClCompile Include="logging.cpp" /> - <ClCompile Include="httpsys.cpp" /> </ItemGroup> <ItemGroup> <Filter Include="CAS"> diff --git a/zencore/httpclient.cpp b/zenhttp/httpclient.cpp index 268483403..9d692271d 100644 --- a/zencore/httpclient.cpp +++ b/zenhttp/httpclient.cpp @@ -1,6 +1,6 @@ // Copyright Epic Games, Inc. All Rights Reserved. -#include <zencore/httpclient.h> +#include <zenhttp/httpclient.h> #include <spdlog/spdlog.h> diff --git a/zencore/httpserver.cpp b/zenhttp/httpserver.cpp index 4b6bd1c0a..a0b17fe44 100644 --- a/zencore/httpserver.cpp +++ b/zenhttp/httpserver.cpp @@ -1,6 +1,6 @@ // Copyright Epic Games, Inc. All Rights Reserved. -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #include "httpsys.h" diff --git a/zencore/httpsys.cpp b/zenhttp/httpsys.cpp index da07a13dd..da07a13dd 100644 --- a/zencore/httpsys.cpp +++ b/zenhttp/httpsys.cpp diff --git a/zencore/httpsys.h b/zenhttp/httpsys.h index fbe293a47..ed4a6a182 100644 --- a/zencore/httpsys.h +++ b/zenhttp/httpsys.h @@ -1,6 +1,6 @@ #pragma once -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #define _WINSOCKAPI_ #include <zencore/windows.h> diff --git a/zencore/include/zencore/httpclient.h b/zenhttp/include/zenhttp/httpclient.h index 4b30eb09b..4a266e59e 100644 --- a/zencore/include/zencore/httpclient.h +++ b/zenhttp/include/zenhttp/httpclient.h @@ -2,7 +2,7 @@ #pragma once -#include "zencore.h" +#include "zenhttp.h" #include <zencore/string.h> #include <gsl/gsl-lite.hpp> diff --git a/zencore/include/zencore/httpserver.h b/zenhttp/include/zenhttp/httpserver.h index 593ff7344..95824b8f4 100644 --- a/zencore/include/zencore/httpserver.h +++ b/zenhttp/include/zenhttp/httpserver.h @@ -2,7 +2,7 @@ #pragma once -#include "zencore.h" +#include "zenhttp.h" #include <zencore/enumflags.h> #include <zencore/iobuffer.h> diff --git a/zenhttp/include/zenhttp/zenhttp.h b/zenhttp/include/zenhttp/zenhttp.h new file mode 100644 index 000000000..da4f4cbe8 --- /dev/null +++ b/zenhttp/include/zenhttp/zenhttp.h @@ -0,0 +1,5 @@ +#pragma once + +#include <zencore/zencore.h> + +#define ZENHTTP_API // Placeholder to allow DLL configs in the future diff --git a/zencore/iothreadpool.cpp b/zenhttp/iothreadpool.cpp index 4ed81d7a2..4ed81d7a2 100644 --- a/zencore/iothreadpool.cpp +++ b/zenhttp/iothreadpool.cpp diff --git a/zencore/iothreadpool.h b/zenhttp/iothreadpool.h index f64868540..f64868540 100644 --- a/zencore/iothreadpool.h +++ b/zenhttp/iothreadpool.h diff --git a/zenhttp/xmake.lua b/zenhttp/xmake.lua new file mode 100644 index 000000000..a1455f46c --- /dev/null +++ b/zenhttp/xmake.lua @@ -0,0 +1,6 @@ +target('zenhttp') + set_kind("static") + add_files("**.cpp") + add_includedirs("include", {public=true}) + add_deps("zencore") + add_packages("vcpkg::gsl-lite")
\ No newline at end of file diff --git a/zenhttp/zenhttp.vcxproj b/zenhttp/zenhttp.vcxproj new file mode 100644 index 000000000..1e6aba90f --- /dev/null +++ b/zenhttp/zenhttp.vcxproj @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>16.0</VCProjectVersion> + <Keyword>Win32Proj</Keyword> + <ProjectGuid>{8eeb3be5-7001-46bf-aafd-edb7558ac012}</ProjectGuid> + <RootNamespace>zenhttp</RootNamespace> + <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v142</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v142</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </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="..\zen_base_debug.props" /> + <Import Project="..\zenfs_common.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="..\zen_base_release.props" /> + <Import Project="..\zenfs_common.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + <PublicIncludeDirectories>$(ProjectDir)include;$(PublicIncludeDirectories)</PublicIncludeDirectories> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + <PublicIncludeDirectories>$(ProjectDir)include;$(PublicIncludeDirectories)</PublicIncludeDirectories> + </PropertyGroup> + <PropertyGroup Label="Vcpkg"> + <VcpkgEnableManifest>true</VcpkgEnableManifest> + </PropertyGroup> + <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <VcpkgUseStatic>true</VcpkgUseStatic> + </PropertyGroup> + <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <VcpkgUseStatic>true</VcpkgUseStatic> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + <AdditionalIncludeDirectories>.\include</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + <AdditionalIncludeDirectories>.\include</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="httpclient.cpp" /> + <ClCompile Include="httpserver.cpp" /> + <ClCompile Include="httpsys.cpp" /> + <ClCompile Include="iothreadpool.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="httpsys.h" /> + <ClInclude Include="include\zenhttp\httpclient.h" /> + <ClInclude Include="include\zenhttp\httpserver.h" /> + <ClInclude Include="iothreadpool.h" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\zencore\zencore.vcxproj"> + <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <None Include="xmake.lua" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/zenhttp/zenhttp.vcxproj.filters b/zenhttp/zenhttp.vcxproj.filters new file mode 100644 index 000000000..16e374d0d --- /dev/null +++ b/zenhttp/zenhttp.vcxproj.filters @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="httpclient.cpp" /> + <ClCompile Include="httpserver.cpp" /> + <ClCompile Include="httpsys.cpp" /> + <ClCompile Include="iothreadpool.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="include\zenhttp\httpclient.h" /> + <ClInclude Include="include\zenhttp\httpserver.h" /> + <ClInclude Include="httpsys.h" /> + <ClInclude Include="iothreadpool.h" /> + </ItemGroup> + <ItemGroup> + <None Include="xmake.lua" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/zenserver/admin/admin.h b/zenserver/admin/admin.h index 3bb8a9158..f90ad4537 100644 --- a/zenserver/admin/admin.h +++ b/zenserver/admin/admin.h @@ -2,7 +2,7 @@ #pragma once -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> class HttpAdminService : public zen::HttpService { diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp index 0e235a9be..46f7cf86a 100644 --- a/zenserver/cache/structuredcache.cpp +++ b/zenserver/cache/structuredcache.cpp @@ -4,7 +4,7 @@ #include <zencore/compactbinaryvalidation.h> #include <zencore/compress.h> #include <zencore/fmtutils.h> -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #include <zencore/timer.h> #include "structuredcache.h" diff --git a/zenserver/cache/structuredcache.h b/zenserver/cache/structuredcache.h index b90301d84..d4bb94c52 100644 --- a/zenserver/cache/structuredcache.h +++ b/zenserver/cache/structuredcache.h @@ -2,7 +2,7 @@ #pragma once -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #include <spdlog/spdlog.h> #include <memory> diff --git a/zenserver/casstore.h b/zenserver/casstore.h index 7166f796e..4ca6908b5 100644 --- a/zenserver/casstore.h +++ b/zenserver/casstore.h @@ -2,7 +2,7 @@ #pragma once -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #include <zenstore/cas.h> namespace zen { diff --git a/zenserver/compute/apply.h b/zenserver/compute/apply.h index 20a58507b..d377e4735 100644 --- a/zenserver/compute/apply.h +++ b/zenserver/compute/apply.h @@ -3,7 +3,7 @@ #pragma once #include <zencore/compactbinary.h> -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #include <zencore/iohash.h> #include <zencore/logging.h> diff --git a/zenserver/diag/diagsvcs.h b/zenserver/diag/diagsvcs.h index 84f8d22ee..6d2b3a19d 100644 --- a/zenserver/diag/diagsvcs.h +++ b/zenserver/diag/diagsvcs.h @@ -2,7 +2,7 @@ #pragma once -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #include <zencore/iobuffer.h> ////////////////////////////////////////////////////////////////////////// diff --git a/zenserver/projectstore.h b/zenserver/projectstore.h index 33bacfdaa..3a8e5f8f8 100644 --- a/zenserver/projectstore.h +++ b/zenserver/projectstore.h @@ -2,7 +2,7 @@ #pragma once -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #include <zencore/uid.h> #include <zencore/xxhash.h> #include <zenstore/cas.h> diff --git a/zenserver/sos/sos.h b/zenserver/sos/sos.h index 283735cbd..da9064262 100644 --- a/zenserver/sos/sos.h +++ b/zenserver/sos/sos.h @@ -2,7 +2,7 @@ #pragma once -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #include <spdlog/spdlog.h> diff --git a/zenserver/testing/httptest.h b/zenserver/testing/httptest.h index 236d17ce7..696543616 100644 --- a/zenserver/testing/httptest.h +++ b/zenserver/testing/httptest.h @@ -2,7 +2,7 @@ #pragma once -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #include <spdlog/spdlog.h> diff --git a/zenserver/testing/launch.h b/zenserver/testing/launch.h index 00f322624..a6eb137d2 100644 --- a/zenserver/testing/launch.h +++ b/zenserver/testing/launch.h @@ -2,7 +2,7 @@ #pragma once -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #include <spdlog/spdlog.h> #include <filesystem> diff --git a/zenserver/upstream/jupiter.h b/zenserver/upstream/jupiter.h index efe9d07ba..7595fe786 100644 --- a/zenserver/upstream/jupiter.h +++ b/zenserver/upstream/jupiter.h @@ -2,7 +2,7 @@ #pragma once -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #include <zencore/refcount.h> #include <zencore/thread.h> diff --git a/zenserver/xmake.lua b/zenserver/xmake.lua index cbe021f90..293743c94 100644 --- a/zenserver/xmake.lua +++ b/zenserver/xmake.lua @@ -1,7 +1,7 @@ target("zenserver") set_kind("binary") add_files("**.cpp") - add_deps("zencore", "zenstore", "zenutil") + add_deps("zencore", "zenhttp", "zenstore", "zenutil") add_includedirs(".") set_symbols("debug") diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index 1c9f1fab9..e52f6aa60 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -2,7 +2,7 @@ #include <zencore/filesystem.h> #include <zencore/fmtutils.h> -#include <zencore/httpserver.h> +#include <zenhttp/httpserver.h> #include <zencore/iobuffer.h> #include <zencore/refcount.h> #include <zencore/scopeguard.h> diff --git a/zenserver/zenserver.vcxproj b/zenserver/zenserver.vcxproj index 3c907e2fb..aa9d538a5 100644 --- a/zenserver/zenserver.vcxproj +++ b/zenserver/zenserver.vcxproj @@ -148,6 +148,9 @@ <ProjectReference Include="..\zencore\zencore.vcxproj"> <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project> </ProjectReference> + <ProjectReference Include="..\zenhttp\zenhttp.vcxproj"> + <Project>{8eeb3be5-7001-46bf-aafd-edb7558ac012}</Project> + </ProjectReference> <ProjectReference Include="..\zenstore\zenstore.vcxproj"> <Project>{26cbbaeb-14c1-4efc-877d-80f48215651c}</Project> </ProjectReference> @@ -155,6 +158,9 @@ <Project>{77f8315d-b21d-4db0-9a6f-2d3359f88a70}</Project> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="xmake.lua" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/zenserver/zenserver.vcxproj.filters b/zenserver/zenserver.vcxproj.filters index 3a17cbb07..a86a6d96d 100644 --- a/zenserver/zenserver.vcxproj.filters +++ b/zenserver/zenserver.vcxproj.filters @@ -91,4 +91,7 @@ <UniqueIdentifier>{303c28c2-3607-4ef4-89bd-e3618fe37e74}</UniqueIdentifier> </Filter> </ItemGroup> + <ItemGroup> + <None Include="xmake.lua" /> + </ItemGroup> </Project>
\ No newline at end of file |