diff options
| author | Aleksey Kliger (λgeek) <alklig@microsoft.com> | 2020-06-06 21:48:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-06 21:48:11 +0300 |
| commit | ba14e694745c40dcbb8c6cfa75b93f3846d8f538 (patch) | |
| tree | b03c6b8690e9983344b4c32a73cdcb93866fa2ae /msvc | |
| parent | ad0b2b8e3d6e92838d6fbe308315cf8e61700b31 (diff) | |
[mono] Move some culture-dependent source files to a separate directory (#19912)
* [mono] Move culture-info-tables.h to a separate directory
We'd like to remove culture-info-tables.h from the dotnet/runtime copy of mono since we use ICU
there for globalization like the rest of .NET 5.
The plan is:
1. We move the file (and some others) to a separate directory (this PR)
2. We tell the sync bot to skip `culture/` in the future
3. We delete the files (or make them empty) in dotnet/runtime
* Also move locale.c and culture-info.h
* Also move mono_w32process_ver_language_name
* [msvc] don't compile locales.c if it doesn't exist
It exists for now, but won't after we stop syncing culture/ to dotnet/runtime
Diffstat (limited to 'msvc')
| -rw-r--r-- | msvc/libmonoruntime-common.targets | 6 | ||||
| -rw-r--r-- | msvc/libmonoruntime-common.targets.filters | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/msvc/libmonoruntime-common.targets b/msvc/libmonoruntime-common.targets index 316efc8a4fc..e0710a96e28 100644 --- a/msvc/libmonoruntime-common.targets +++ b/msvc/libmonoruntime-common.targets @@ -28,8 +28,8 @@ <ClCompile Include="$(MonoSourceLocation)\mono\metadata\coree.c" /> <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree.h" /> <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree-internals.h" /> - <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info.h" /> - <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info-tables.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\culture\culture-info.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\culture\culture-info-tables.h" /> <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-helpers.c" /> <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.c" /> <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-ppdb.h" /> @@ -62,7 +62,7 @@ <ClCompile Include="$(MonoSourceLocation)\mono\metadata\loaded-images-netcore.c" /> <ClCompile Include="$(MonoSourceLocation)\mono\metadata\loader.c" /> <ClInclude Include="$(MonoSourceLocation)\mono\metadata\loader-internals.h" /> - <ClCompile Include="$(MonoSourceLocation)\mono\metadata\locales.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\culture\locales.c" Condition="Exists('$(MonoSourceLocation)\mono\culture\locales.c')" /> <ClInclude Include="$(MonoSourceLocation)\mono\metadata\locales.h" /> <ClCompile Include="$(MonoSourceLocation)\mono\metadata\lock-tracer.c" /> <ClInclude Include="$(MonoSourceLocation)\mono\metadata\lock-tracer.h" /> diff --git a/msvc/libmonoruntime-common.targets.filters b/msvc/libmonoruntime-common.targets.filters index fb4a4e3c840..7826285c4f7 100644 --- a/msvc/libmonoruntime-common.targets.filters +++ b/msvc/libmonoruntime-common.targets.filters @@ -73,10 +73,10 @@ <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree-internals.h"> <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter> </ClInclude> - <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info.h"> + <ClInclude Include="$(MonoSourceLocation)\mono\culture\culture-info.h"> <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter> </ClInclude> - <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info-tables.h"> + <ClInclude Include="$(MonoSourceLocation)\mono\culture\culture-info-tables.h"> <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter> </ClInclude> <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-helpers.c"> @@ -175,7 +175,7 @@ <ClInclude Include="$(MonoSourceLocation)\mono\metadata\loader-internals.h"> <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter> </ClInclude> - <ClCompile Include="$(MonoSourceLocation)\mono\metadata\locales.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\culture\locales.c"> <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter> </ClCompile> <ClInclude Include="$(MonoSourceLocation)\mono\metadata\locales.h"> |