Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
/src/mono/llvm @vargaz @SamMonoRT @imhameed @EgorBo

/src/mono/mono/arch @vargaz
/src/mono/mono/benchmark @SamMonoRT @naricc
/src/mono/mono/dis @lambdageek @vargaz
/src/mono/mono/eglib @vargaz @lambdageek @CoffeeFlux

/src/mono/mono/metadata @vargaz @lambdageek @thaystg @CoffeeFlux
Expand All @@ -43,7 +41,6 @@
/src/mono/mono/mini/debugger-agent.c @vargaz @thaystg @DavidKarlas @lambdageek
/src/mono/mono/mini/interp/* @BrzVlad @vargaz

/src/mono/mono/native @egorbo @marek-safar
/src/mono/mono/profiler @BrzVlad @lambdageek
/src/mono/mono/sgen @BrzVlad @lambdageek @naricc

Expand All @@ -56,4 +53,4 @@
/src/mono/mono/utils/mono-state* @lambdageek
/src/mono/mono/utils/mono-threads* @lambdageek @vargaz

/src/mono/netcore @marek-safar @akoeplinger @egorbo @vargaz @steveisok
/src/mono/netcore @marek-safar @akoeplinger @vargaz @steveisok
15 changes: 0 additions & 15 deletions src/mono/.gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1 @@
Makefile.in

/aclocal.m4
/autom4te.cache
/compile
/config.guess
/config.h.in
/config.h
/config.sub
/configure
/depcomp
/install-sh
/ltmain.sh
/missing

mono_crash*
16 changes: 5 additions & 11 deletions src/mono/.vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"/usr/local/include",
"${workspaceRoot}",
"${workspaceRoot}/mono",
"${workspaceRoot}/mono/eglib",
"${workspaceRoot}/support"
"${workspaceRoot}/mono/eglib"
],
"defines": [],
"intelliSenseMode": "clang-x64",
Expand All @@ -18,8 +17,7 @@
"/usr/local/include",
"${workspaceRoot}",
"${workspaceRoot}/mono",
"${workspaceRoot}/mono/eglib",
"${workspaceRoot}/support"
"${workspaceRoot}/mono/eglib"
],
"limitSymbolsToIncludedHeaders": true,
"databaseFilename": ""
Expand All @@ -38,8 +36,7 @@
"/usr/local/include",
"${workspaceRoot}",
"${workspaceRoot}/mono",
"${workspaceRoot}/mono/eglib",
"${workspaceRoot}/support"
"${workspaceRoot}/mono/eglib"
],
"defines": [],
"intelliSenseMode": "clang-x64",
Expand All @@ -50,8 +47,7 @@
"/usr/local/include",
"${workspaceRoot}",
"${workspaceRoot}/mono",
"${workspaceRoot}/mono/eglib",
"${workspaceRoot}/support"
"${workspaceRoot}/mono/eglib"
],
"limitSymbolsToIncludedHeaders": true,
"databaseFilename": ""
Expand All @@ -65,7 +61,6 @@
"${workspaceRoot}",
"${workspaceRoot}/mono",
"${workspaceRoot}/mono/eglib",
"${workspaceRoot}/support"
],
"defines": [
"_DEBUG",
Expand All @@ -78,8 +73,7 @@
"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include/*",
"${workspaceRoot}",
"${workspaceRoot}/mono",
"${workspaceRoot}/mono/eglib",
"${workspaceRoot}/support"
"${workspaceRoot}/mono/eglib"
],
"limitSymbolsToIncludedHeaders": true,
"databaseFilename": ""
Expand Down
81 changes: 40 additions & 41 deletions src/mono/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,47 +46,46 @@ if(ENABLE_MINIMAL)
process_enable_minimal()
endif()

function(extract_mono_corlib_version)
file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac corlib_version_line REGEX ^MONO_CORLIB_VERSION=)

if(corlib_version_line STREQUAL "")
message(FATAL_ERROR "Couldn't find MONO_CORLIB_VERSION from configure.ac")
endif()

string(REGEX REPLACE "MONO_CORLIB_VERSION=([0-9a-fA-F\-]+)" "\\1" corlib_version ${corlib_version_line})

if(corlib_version STREQUAL "")
message(FATAL_ERROR "Couldn't parse corlib version")
endif()

set(MONO_CORLIB_VERSION "\"${corlib_version}\"" PARENT_SCOPE)
endfunction()

extract_mono_corlib_version()

if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mono.proj")
set(ENABLE_NETCORE 1)
endif()

if(ENABLE_NETCORE)
set(DISABLE_REMOTING 1)
set(DISABLE_REFLECTION_EMIT_SAVE 1)
set(DISABLE_APPDOMAINS 1)
set(DISABLE_SHADOW_COPY 1)
set(DISABLE_CLEANUP 1)
set(DISABLE_ASSEMBLY_REMAPPING 1)
set(DISABLE_SECURITY 1)
set(DISABLE_MDB 1)
set(DISABLE_COM 1)
set(DISABLE_GAC 1)
set(DISABLE_PERFCOUNTERS 1)
set(DISABLE_ATTACH 1)
set(DISABLE_CONFIG 1)
set(DISABLE_CFGDIR_CONFIG 1)
set(DISABLE_VERIFIER 1)
else()
message(FATAL_ERROR "Building without -DENABLE_NETCORE=1 is not supported.")
endif()
#
# This is the version of the corlib-runtime interface. When
# making changes to this interface (by changing the layout
# of classes the runtime knows about, changing icall signature or
# semantics etc), change this variable.
#
# This must be unique relative to corlib interface and semantics.
#
# If you change corlib such that a runtime change is required, or
# vice versa, change this string. Examples include removing icalls,
# adding icalls, changing icall signatures, and changing type layouts
# that both sides know.
#
# It is an arbitrary string and should be parsed as such.
# A guid works and is encouraged.
#
# There is no ordering of corlib versions, no old or new,
# an exact match is required between corlib and runtime.
#
# This line is parsed by other tools, it should remain in the format they expect.
#
set(MONO_CORLIB_VERSION 1A5E0066-58DC-428A-B21C-0AD6CDAE2789)

set(ENABLE_NETCORE 1)

set(DISABLE_REMOTING 1)
set(DISABLE_REFLECTION_EMIT_SAVE 1)
set(DISABLE_APPDOMAINS 1)
set(DISABLE_SHADOW_COPY 1)
set(DISABLE_CLEANUP 1)
set(DISABLE_ASSEMBLY_REMAPPING 1)
set(DISABLE_SECURITY 1)
set(DISABLE_MDB 1)
set(DISABLE_COM 1)
set(DISABLE_GAC 1)
set(DISABLE_PERFCOUNTERS 1)
set(DISABLE_ATTACH 1)
set(DISABLE_CONFIG 1)
set(DISABLE_CFGDIR_CONFIG 1)
set(DISABLE_VERIFIER 1)

# Dependencies between options
if(DISABLE_ASSEMBLY_REMAPPING)
Expand Down
142 changes: 0 additions & 142 deletions src/mono/Makefile.am

This file was deleted.

Loading