summaryrefslogtreecommitdiff
path: root/src/md/compiler
diff options
context:
space:
mode:
Diffstat (limited to 'src/md/compiler')
-rw-r--r--src/md/compiler/Compiler.settings.targets68
-rw-r--r--src/md/compiler/crossgen/MDCompiler_crossgen.nativeproj15
-rw-r--r--src/md/compiler/dac/dirs.proj19
-rw-r--r--src/md/compiler/dbi/MDCompiler-dbi.props9
-rw-r--r--src/md/compiler/dbi/dirs.proj19
-rw-r--r--src/md/compiler/dirs.proj27
-rw-r--r--src/md/compiler/regmeta.cpp5
-rw-r--r--src/md/compiler/wks/MDCompiler_wks.nativeproj19
8 files changed, 4 insertions, 177 deletions
diff --git a/src/md/compiler/Compiler.settings.targets b/src/md/compiler/Compiler.settings.targets
deleted file mode 100644
index 97f2504796..0000000000
--- a/src/md/compiler/Compiler.settings.targets
+++ /dev/null
@@ -1,68 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
- <!--
- We build MetaData in several flavors:
- - Full version (wks) - part of clr.dll/coreclr.dll.
- - dac version - does not need Emit APIs.
- - Standalone versions for:
- * mscordbi.dll (hands the interfaces over to debugger client (e.g. VS) - does not need Emit APIs.
- * CorDbg - does not need Emit APIs.
- * WinRT
- - Read-Only version (ships in Windows) - does not need Emit and Internal APIs.
- - Read-Writer version (ships as private component of MidlRt.exe SDK tool) - does not need Internal APIs.
- -->
-
- <!--Import the settings-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\src\MD\MD.props" />
-
- <PropertyGroup>
- <MDCompilerSrcDirectory>$(ClrSrcDirectory)\MD\Compiler\</MDCompilerSrcDirectory>
- <UserIncludes>
- $(UserIncludes);
- $(ClrSrcDirectory)\md\inc;
- $(ClrSrcDirectory)\vm;
- $(ClrSrcDirectory)\strongname\inc
- </UserIncludes>
- <ClAdditionalOptions>$(ClAdditionalOptions) -DUNICODE -D_UNICODE</ClAdditionalOptions>
- <!--OK to delete NO_NTDLL for devdiv builds.-->
- <OutputPath>$(ClrLibDest)</OutputPath>
- <TargetType>LIBRARY</TargetType>
- <PCHHeader>stdafx.h</PCHHeader>
- <EnableCxxPCHHeaders>true</EnableCxxPCHHeaders>
- <!--PCH: Both precompiled header and cpp are on the same $(MDCompilerSrcDirectory)\ path this is likely to be wrong.-->
- <PCHCompile>$(MDCompilerSrcDirectory)\stdafx.cpp</PCHCompile>
- <PCHObject>stdafx_compiler.obj</PCHObject>
- <LinkUseCMT>false</LinkUseCMT>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="$(ClrSrcDirectory)inc\corguids.nativeproj">
- <Comment>clrinternal.h</Comment>
- </ProjectReference>
- </ItemGroup>
-
- <ItemGroup>
- <CppCompile Include="$(MDCompilerSrcDirectory)\AssemblyMD.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\AssemblyMD_Emit.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\ClassFactory.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\CustAttr_Import.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\CustAttr_Emit.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\Disp.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\Emit.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\FilterManager.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\Helper.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\Import.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\ImportHelper.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\MDPerf.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\MDUtil.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\MDValidator.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\NewMerger.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\RegMeta.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\RegMeta_CompilerSupport.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\RegMeta_Emit.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\RegMeta_Import.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\RegMeta_IMetaDataTables.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\RegMeta_VM.cpp" />
- <CppCompile Include="$(MDCompilerSrcDirectory)\VerifyLayouts.cpp" />
- </ItemGroup>
-</Project>
diff --git a/src/md/compiler/crossgen/MDCompiler_crossgen.nativeproj b/src/md/compiler/crossgen/MDCompiler_crossgen.nativeproj
deleted file mode 100644
index 8ea56d2cdc..0000000000
--- a/src/md/compiler/crossgen/MDCompiler_crossgen.nativeproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="dogfood">
- <PropertyGroup>
- <!-- All features are set in file:..\..\MD.props -->
- <BuildSysBinaries>true</BuildSysBinaries>
- <MetadataFlavor>wks</MetadataFlavor>
- <OutputName>mdcompiler_crossgen</OutputName>
- </PropertyGroup>
-
- <!--Import the settings-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\xplat\SetCrossGen.props" />
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\src\MD\Compiler\Compiler.settings.targets" />
-
- <!--Import the targets-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.targets" />
-</Project>
diff --git a/src/md/compiler/dac/dirs.proj b/src/md/compiler/dac/dirs.proj
deleted file mode 100644
index cf39ab9ea2..0000000000
--- a/src/md/compiler/dac/dirs.proj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <!--Import the settings-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
-
- <PropertyGroup>
- <BuildInPhase1>true</BuildInPhase1>
- <BuildInPhaseDefault>false</BuildInPhaseDefault>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- <BuildSysBinaries>true</BuildSysBinaries>
- </PropertyGroup>
-
- <!--The following projects will build during PHASE 1-->
- <ItemGroup Condition="'$(BuildExePhase)' == '1'">
- <ProjectFile Include="HostLocal\mdcompiler_dac.nativeproj" />
- </ItemGroup>
-
- <!--Import the targets-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
-</Project>
diff --git a/src/md/compiler/dbi/MDCompiler-dbi.props b/src/md/compiler/dbi/MDCompiler-dbi.props
deleted file mode 100644
index a9c469c98e..0000000000
--- a/src/md/compiler/dbi/MDCompiler-dbi.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="dogfood">
- <PropertyGroup>
- <!-- All features are set in file:..\..\MD.props -->
- <MetadataFlavor>mscordbi</MetadataFlavor>
- </PropertyGroup>
-
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\src\MD\Compiler\Compiler.settings.targets" />
-
-</Project>
diff --git a/src/md/compiler/dbi/dirs.proj b/src/md/compiler/dbi/dirs.proj
deleted file mode 100644
index 89a842727c..0000000000
--- a/src/md/compiler/dbi/dirs.proj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <!--Import the settings-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
-
- <PropertyGroup>
- <BuildInPhase1>true</BuildInPhase1>
- <BuildInPhaseDefault>false</BuildInPhaseDefault>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- <BuildSysBinaries>true</BuildSysBinaries>
- </PropertyGroup>
-
- <!--The following projects will build during PHASE 1-->
- <ItemGroup Condition="'$(BuildExePhase)' == '1'">
- <ProjectFile Condition="'$(FeatureDbiDebugging)'=='true'" Include="HostLocal\mdcompiler-dbi.nativeproj" />
- </ItemGroup>
-
- <!--Import the targets-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
-</Project>
diff --git a/src/md/compiler/dirs.proj b/src/md/compiler/dirs.proj
deleted file mode 100644
index 2e97d62490..0000000000
--- a/src/md/compiler/dirs.proj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <!--Import the settings-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
-
- <PropertyGroup>
- <BuildInPhase1>true</BuildInPhase1>
- <BuildInPhaseDefault>false</BuildInPhaseDefault>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- <BuildSysBinaries>true</BuildSysBinaries>
- </PropertyGroup>
-
- <!--The following projects will build during PHASE 1-->
- <ItemGroup Condition="'$(BuildExePhase)' == '1'">
- <ProjectFile Include="wks\mdcompiler_wks.nativeproj" />
- <ProjectFile Include="dac\dirs.proj" />
- <ProjectFile Include="dbi\dirs.proj" />
- </ItemGroup>
-
- <!--The following projects will build during PHASE 1 of the Desktop build -->
- <ItemGroup Condition="'$(BuildExePhase)' == '1' and '$(FeatureCoreClr)' != 'true'">
- <ProjectFile Include="winrt-ro\mdcompiler-winrt-ro.nativeproj" />
- <ProjectFile Include="winrt-rw\mdcompiler-winrt-rw.nativeproj" />
- </ItemGroup>
-
- <!--Import the targets-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
-</Project>
diff --git a/src/md/compiler/regmeta.cpp b/src/md/compiler/regmeta.cpp
index 230d1e4ff0..feb1cdd31b 100644
--- a/src/md/compiler/regmeta.cpp
+++ b/src/md/compiler/regmeta.cpp
@@ -829,7 +829,10 @@ int DumpMD_VWriteMarker(__in __in_z const char *str, va_list marker)
{
if (FAILED(hr = m_output.ReSizeNoThrow(STRING_BUFFER_LEN * i)))
return 0;
- count = _vsnprintf((char *)m_output.Ptr(), STRING_BUFFER_LEN * i, str, marker);
+ va_list markerCopy;
+ va_copy(markerCopy, marker);
+ count = _vsnprintf_s((char *)m_output.Ptr(), STRING_BUFFER_LEN * i, _TRUNCATE, str, markerCopy);
+ va_end(markerCopy);
i *= 2;
}
OutputDebugStringA((LPCSTR)m_output.Ptr());
diff --git a/src/md/compiler/wks/MDCompiler_wks.nativeproj b/src/md/compiler/wks/MDCompiler_wks.nativeproj
deleted file mode 100644
index 8457d87c19..0000000000
--- a/src/md/compiler/wks/MDCompiler_wks.nativeproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="dogfood">
- <PropertyGroup>
- <!-- All features are set in file:..\..\MD.props -->
- <MetadataFlavor>wks</MetadataFlavor>
- </PropertyGroup>
-
- <!--Import the settings-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\src\MD\Compiler\Compiler.settings.targets" />
-
- <!--Leaf project Properties-->
- <PropertyGroup>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- <BuildSysBinaries>true</BuildSysBinaries>
- <OutputName>MDCompiler_wks</OutputName>
- </PropertyGroup>
-
- <!--Import the targets-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.targets" />
-</Project>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 05:09:01 +0000