Restructured build/package/install targets and split GC libraries.

* Added package/install targets.
* Moved sgen into separate library.
* SGEN set as default GC for build (used GC controlled through mono.props).

1 files changed, 6 insertions, 45 deletions

diff --git a/msvc/libmonoruntime.vcxproj b/msvc/libmonoruntime.vcxproj
index a90e7e16b5b..d9e27ba4b2c 100644
--- a/msvc/libmonoruntime.vcxproj
+++ b/msvc/libmonoruntime.vcxproj
@@ -95,38 +95,14 @@
     <ClCompile Include="..\mono\metadata\sgen-mono.c" />

     <ClCompile Include="..\mono\metadata\threadpool-ms-io.c" />

     <ClCompile Include="..\mono\metadata\threadpool-ms.c" />

-    <ClCompile Include="..\mono\sgen\sgen-alloc.c" />

     <ClCompile Include="..\mono\metadata\sgen-bridge.c" />

-    <ClCompile Include="..\mono\sgen\sgen-cardtable.c" />

-    <ClCompile Include="..\mono\sgen\sgen-debug.c" />

-    <ClCompile Include="..\mono\sgen\sgen-descriptor.c" />

-    <ClCompile Include="..\mono\sgen\sgen-gc.c" />

-    <ClCompile Include="..\mono\sgen\sgen-gchandles.c" />

-    <ClCompile Include="..\mono\sgen\sgen-gray.c" />

-    <ClCompile Include="..\mono\sgen\sgen-hash-table.c" />

-    <ClCompile Include="..\mono\sgen\sgen-internal.c" />

-    <ClCompile Include="..\mono\sgen\sgen-los.c" />

-    <ClCompile Include="..\mono\sgen\sgen-marksweep.c" />

-    <ClCompile Include="..\mono\sgen\sgen-memory-governor.c" />

     <ClCompile Include="..\mono\metadata\sgen-new-bridge.c" />

-    <ClCompile Include="..\mono\sgen\sgen-nursery-allocator.c" />

     <ClCompile Include="..\mono\metadata\sgen-old-bridge.c" />

     <ClCompile Include="..\mono\metadata\sgen-os-mach.c" />

     <ClCompile Include="..\mono\metadata\sgen-os-posix.c" />

     <ClCompile Include="..\mono\metadata\sgen-os-win32.c" />

-    <ClCompile Include="..\mono\sgen\sgen-pinning-stats.c" />

-    <ClCompile Include="..\mono\sgen\sgen-pinning.c" />

-    <ClCompile Include="..\mono\sgen\sgen-pointer-queue.c" />

-    <ClCompile Include="..\mono\sgen\sgen-array-list.c" />

-    <ClCompile Include="..\mono\sgen\sgen-protocol.c" />

-    <ClCompile Include="..\mono\sgen\sgen-qsort.c" />

-    <ClCompile Include="..\mono\sgen\sgen-simple-nursery.c" />

-    <ClCompile Include="..\mono\sgen\sgen-split-nursery.c" />

     <ClCompile Include="..\mono\metadata\sgen-tarjan-bridge.c" />

     <ClCompile Include="..\mono\metadata\sgen-toggleref.c" />

-    <ClCompile Include="..\mono\sgen\sgen-thread-pool.c" />

-    <ClCompile Include="..\mono\sgen\sgen-workers.c" />

-    <ClCompile Include="..\mono\sgen\sgen-fin-weak-hash.c" />

     <ClCompile Include="..\mono\metadata\sgen-stw.c" />

     <ClCompile Include="..\mono\metadata\socket-io.c" />

     <ClCompile Include="..\mono\metadata\string-icalls.c" />

@@ -159,6 +135,8 @@
     <ClInclude Include="..\mono\metadata\number-ms.h" />

     <ClInclude Include="..\mono\metadata\remoting.h" />

     <ClInclude Include="..\mono\metadata\seq-points-data.h" />

+    <ClInclude Include="..\mono\metadata\sgen-bridge-internals.h" />

+    <ClInclude Include="..\mono\metadata\sgen-client-mono.h" />

     <ClInclude Include="..\mono\metadata\threadpool-ms-io.h" />

     <ClInclude Include="..\mono\metadata\threadpool-ms.h" />

     <ClInclude Include="..\mono\sgen\gc-internal-agnostic.h" />

@@ -199,25 +177,8 @@
     <ClInclude Include="..\mono\metadata\security-core-clr.h" />

     <ClInclude Include="..\mono\metadata\security-manager.h" />

     <ClInclude Include="..\mono\metadata\security.h" />

-    <ClInclude Include="..\mono\sgen\sgen-archdep.h" />

     <ClInclude Include="..\mono\metadata\sgen-bridge.h" />

-    <ClInclude Include="..\mono\sgen\sgen-cardtable.h" />

-    <ClInclude Include="..\mono\sgen\sgen-conf.h" />

-    <ClInclude Include="..\mono\sgen\sgen-copy-object.h" />

-    <ClInclude Include="..\mono\sgen\sgen-descriptor.h" />

-    <ClInclude Include="..\mono\sgen\sgen-gc.h" />

-    <ClInclude Include="..\mono\sgen\sgen-gray.h" />

-    <ClInclude Include="..\mono\sgen\sgen-major-copy-object.h" />

-    <ClInclude Include="..\mono\sgen\sgen-memory-governor.h" />

-    <ClInclude Include="..\mono\sgen\sgen-minor-copy-object.h" />

-    <ClInclude Include="..\mono\sgen\sgen-minor-scan-object.h" />

-    <ClInclude Include="..\mono\sgen\sgen-pinning.h" />

-    <ClInclude Include="..\mono\sgen\sgen-protocol.h" />

-    <ClInclude Include="..\mono\sgen\sgen-qsort.h" />

-    <ClInclude Include="..\mono\sgen\sgen-scan-object.h" />

     <ClInclude Include="..\mono\metadata\sgen-toggleref.h" />

-    <ClInclude Include="..\mono\sgen\sgen-thread-pool.h" />

-    <ClInclude Include="..\mono\sgen\sgen-workers.h" />

     <ClInclude Include="..\mono\metadata\socket-io.h" />

     <ClInclude Include="..\mono\metadata\string-icalls.h" />

     <ClInclude Include="..\mono\metadata\sysmath.h" />

@@ -364,7 +325,7 @@
       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WIN32;$(BOEHM_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;$(GC_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

@@ -395,7 +356,7 @@
       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WIN32;$(BOEHM_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;$(GC_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

     </ClCompile>

@@ -428,7 +389,7 @@
       <Optimization>MaxSpeed</Optimization>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <PreprocessorDefinitions>WIN32;$(BOEHM_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;$(GC_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

@@ -464,7 +425,7 @@
       <Optimization>MaxSpeed</Optimization>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <PreprocessorDefinitions>WIN32;$(BOEHM_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;$(GC_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>