build: move oss required to build conhost out of dep/ (#5451)

This change is necessary as the dep/ folder is not synced into the
Windows source tree.

I've also added a build rule producing a lib for {fmt}.

This will be required for our next OS ingestion.
This commit is contained in:
Dustin L. Howett (MSFT) 2020-04-21 14:43:09 -07:00 committed by GitHub
parent bc6ea11233
commit 86685079ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
56 changed files with 49 additions and 8 deletions

View File

@ -52,6 +52,7 @@ SUMS$
\.yml$
\.zip$
^dep/
^oss/
^doc/reference/UTF8-torture-test\.txt$
^src/interactivity/onecore/BgfxEngine\.
^src/renderer/wddmcon/WddmConRenderer\.

View File

@ -1656,6 +1656,7 @@ osfhandle
OSG
OSGENG
osign
oss
ostream
ostringstream
Ou

8
oss/README.md Normal file
View File

@ -0,0 +1,8 @@
### Component-Governance-tracked OSS dependencies
This directory contains mirrored open-source projects that are used by the
console host and Windows Terminal. Code in this directory will be replicated
into the Windows OS repository.
All projects in this directory **must** bear Component Governance Manifests
(`cgmanifest.json` files) indicating their provenance.

View File

@ -86,7 +86,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\chromium;$(OpenConsoleDir)\dep\fmt\include;$(SolutionDir)\dep\dynamic_bitset;$(SolutionDir)\dep\libpopcnt;$(OpenConsoleDir)\dep\Win32K;$(OpenConsoleDir)\dep\gsl\include;$(OpenConsoleDir)\dep\wil\include;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\Win32K;$(OpenConsoleDir)\dep\gsl\include;$(OpenConsoleDir)\dep\wil\include;$(SolutionDir)\oss\chromium;$(SolutionDir)\oss\fmt\include;$(SolutionDir)\oss\dynamic_bitset;$(SolutionDir)\oss\libpopcnt;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
</ClCompile>
<ClCompile>
<!-- Manually include the generated TerminalCore header's path, because

View File

@ -83,7 +83,7 @@
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(SolutionDir)\src\inc;$(SolutionDir)\dep;$(SolutionDir)\dep\Console;$(SolutionDir)\dep\chromium;$(SolutionDir)\dep\fmt\include;$(SolutionDir)\dep\dynamic_bitset;$(SolutionDir)\dep\libpopcnt;$(SolutionDir)\dep\Win32K;$(SolutionDir)\dep\gsl\include;$(SolutionDir)\dep\wil\include;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)\src\inc;$(SolutionDir)\dep;$(SolutionDir)\dep\Console;$(SolutionDir)\dep\Win32K;$(SolutionDir)\dep\gsl\include;$(SolutionDir)\dep\wil\include;$(SolutionDir)\oss\chromium;$(SolutionDir)\oss\fmt\include;$(SolutionDir)\oss\dynamic_bitset;$(SolutionDir)\oss\libpopcnt;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
@ -147,7 +147,7 @@
<CodeAnalysisRuleSet>$(SolutionDir)\src\StaticAnalysis.ruleset</CodeAnalysisRuleSet>
<EnableCppCoreCheck>true</EnableCppCoreCheck>
<RunCodeAnalysis>true</RunCodeAnalysis>
<CAExcludePath>$(CAExcludePath);$(SolutionDir)\dep;$(SolutionDir)\packages</CAExcludePath>
<CAExcludePath>$(CAExcludePath);$(SolutionDir)\dep;$(SolutionDir)\oss;$(SolutionDir)\packages</CAExcludePath>
<OpenConsoleVcpkgConfiguration>Release</OpenConsoleVcpkgConfiguration>
<OpenConsoleTppVcpkgConfiguration>Release</OpenConsoleTppVcpkgConfiguration>
</PropertyGroup>

2
src/dep/dirs Normal file
View File

@ -0,0 +1,2 @@
DIRS=\
fmt \

View File

@ -12,14 +12,14 @@
<ItemDefinitionGroup>
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>$(SolutionDir)\dep\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)\oss\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="$(SolutionDir)\dep\fmt\src\*.cc" />
<ClCompile Include="$(SolutionDir)\oss\fmt\src\*.cc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SolutionDir)\dep\fmt\include\fmt\*.h" />
<ClInclude Include="$(SolutionDir)\oss\fmt\include\fmt\*.h" />
</ItemGroup>
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
<Import Project="$(SolutionDir)src\common.build.post.props" />

20
src/dep/fmt/sources Normal file
View File

@ -0,0 +1,20 @@
!include ..\..\project.inc
# -------------------------------------
# Program Information
# -------------------------------------
TARGETNAME = ConOSSFmt
TARGETTYPE = LIBRARY
# -------------------------------------
# Windows Console
# - OSS Dependency: {fmt}
# -------------------------------------
PRECOMPILED_CXX = 0
SOURCES = \
..\..\..\oss\fmt\src\format.cc \
..\..\..\oss\fmt\src\os.cc \

View File

@ -1,6 +1,7 @@
DIRS=\
buffer \
interactivity \
dep \
host \
propsheet \
propslib \

View File

@ -36,8 +36,11 @@ CONSOLE_OBJ_PATH = $(WINCORE_OBJ_PATH)\console\open\src
INCLUDES= \
$(INCLUDES); \
$(CONSOLE_SRC_PATH)\inc; \
$(CONSOLE_OBJ_PATH)\..\..\dep\$(O)\vpack; \
$(CONSOLE_SRC_PATH)\..\..\inc; \
$(CONSOLE_SRC_PATH)\..\oss\dynamic_bitset; \
$(CONSOLE_SRC_PATH)\..\oss\libpopcnt; \
$(CONSOLE_SRC_PATH)\..\oss\chromium; \
$(CONSOLE_SRC_PATH)\..\oss\fmt\include; \
$(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \
$(MINWIN_RESTRICTED_PRIV_SDK_INC_PATH_L); \
$(MINCORE_INTERNAL_PRIV_SDK_INC_PATH_L); \

View File

@ -51,6 +51,8 @@ MSC_WARNING_LEVEL = /W4 /WX
# Code in the OneCore depot automatically excludes default Win32 libraries.
CONSOLE_SRC_PATH = $(PROJECT_ROOT)\core\console\open\src
# -------------------------------------
# Sources, Headers, and Libraries
# -------------------------------------
@ -62,7 +64,10 @@ SOURCES = \
INCLUDES = \
..\..\..\inc; \
$(WINCORE_OBJ_PATH)\console\dep\$(O)\vpack; \
$(CONSOLE_SRC_PATH)\..\oss\dynamic_bitset; \
$(CONSOLE_SRC_PATH)\..\oss\libpopcnt; \
$(CONSOLE_SRC_PATH)\..\oss\chromium; \
$(CONSOLE_SRC_PATH)\..\oss\fmt\include; \
$(INCLUDES) \
TARGETLIBS = \