From: Josh Peterson <petersonjm1@gmail.com>
Date: Tue, 18 Apr 2017 18:17:10 +0000 (-0400)
Subject: Separate the eglib source and build instructions
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=0c20ba842f76623f0b6e934e387c8d20f9d1e052

Separate the eglib source and build instructions

This change extracts the eglib source files from the build instuctions
for builds via MSVC on Windows. It also separates the source files into
platform-specific and common .targets files. This provides more
flexibility for builds from MSVC in a few important ways:

1. We can do MSVC-based builds for platforms that will not be pushed to
public repos by checking out the Mono code externally and importing the
.targets files into a custom .vcxproj for the platform.
2. We can replace the platform specific .targets files with a custom set
of source files to implement a different platform abstraction layer
that will not be public without the need to merge changes to the
.vcxproj from the public repo.

This allows for ease of synchronizing changes to the public Mono
repo with private forks, while _not_ changing the behavior of the code
in the public repo.
---

diff --git a/msvc/eglib-common.targets b/msvc/eglib-common.targets
new file mode 100644
index 00000000000..0b72e5a97e9
--- /dev/null
+++ b/msvc/eglib-common.targets
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\garray.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gbytearray.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gerror.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\ghashtable.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\giconv.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\glist.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmarkup.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmem.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\goutput.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gpattern.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gptrarray.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gqsort.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gqueue.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gshell.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gslist.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gspawn.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gstr.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gstring.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gunicode.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gutf8.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MonoSourceLocation)\eglib\src\glib.h" />
+    <ClInclude Include="$(MonoSourceLocation)\eglib\src\gmodule.h" />
+    <ClInclude Include="$(MonoSourceLocation)\eglib\src\sort.frag.h" />
+  </ItemGroup>
+</Project>
diff --git a/msvc/eglib-posix.targets b/msvc/eglib-posix.targets
new file mode 100644
index 00000000000..ab3165e3e8c
--- /dev/null
+++ b/msvc/eglib-posix.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile-posix.c" />
+  </ItemGroup>
+</Project>
diff --git a/msvc/eglib-win32.targets b/msvc/eglib-win32.targets
new file mode 100644
index 00000000000..b95abe37f8c
--- /dev/null
+++ b/msvc/eglib-win32.targets
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gdate-win32.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gdir-win32.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile-win32.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmisc-win32.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmodule-win32.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gpath.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gtimer-win32.c" />
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gunicode-win32.c" />
+   </ItemGroup>
+   <ItemGroup>
+    <ClInclude Include="$(MonoSourceLocation)\eglib\src\gmodule-win32-internals.h" />
+  </ItemGroup>
+</Project>
diff --git a/msvc/eglib.vcxproj b/msvc/eglib.vcxproj
index 98a8849ab35..5e482d86b45 100644
--- a/msvc/eglib.vcxproj
+++ b/msvc/eglib.vcxproj
@@ -150,44 +150,9 @@
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\eglib\src\garray.c" />
-    <ClCompile Include="..\eglib\src\gbytearray.c" />
-    <ClCompile Include="..\eglib\src\gdate-win32.c" />
-    <ClCompile Include="..\eglib\src\gdir-win32.c" />
-    <ClCompile Include="..\eglib\src\gerror.c" />
-    <ClCompile Include="..\eglib\src\gfile-posix.c" />
-    <ClCompile Include="..\eglib\src\gfile-win32.c" />
-    <ClCompile Include="..\eglib\src\gfile.c" />
-    <ClCompile Include="..\eglib\src\ghashtable.c" />
-    <ClCompile Include="..\eglib\src\giconv.c" />
-    <ClCompile Include="..\eglib\src\glist.c" />
-    <ClCompile Include="..\eglib\src\gmarkup.c" />
-    <ClCompile Include="..\eglib\src\gmem.c" />
-    <ClCompile Include="..\eglib\src\gmisc-win32.c" />
-    <ClCompile Include="..\eglib\src\gmodule-win32.c" />
-    <ClCompile Include="..\eglib\src\goutput.c" />
-    <ClCompile Include="..\eglib\src\gpath.c" />
-    <ClCompile Include="..\eglib\src\gpattern.c" />
-    <ClCompile Include="..\eglib\src\gptrarray.c" />
-    <ClCompile Include="..\eglib\src\gqsort.c" />
-    <ClCompile Include="..\eglib\src\gqueue.c" />
-    <ClCompile Include="..\eglib\src\gshell.c" />
-    <ClCompile Include="..\eglib\src\gslist.c" />
-    <ClCompile Include="..\eglib\src\gspawn.c" />
-    <ClCompile Include="..\eglib\src\gstr.c" />
-    <ClCompile Include="..\eglib\src\gstring.c" />
-    <ClCompile Include="..\eglib\src\gtimer-win32.c" />
-    <ClCompile Include="..\eglib\src\gunicode-win32.c" />
-    <ClCompile Include="..\eglib\src\gunicode.c" />
-    <ClCompile Include="..\eglib\src\gutf8.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\eglib\src\glib.h" />
-    <ClInclude Include="..\eglib\src\gmodule-win32-internals.h" />
-    <ClInclude Include="..\eglib\src\gmodule.h" />
-    <ClInclude Include="..\eglib\src\sort.frag.h" />
-  </ItemGroup>
+  <Import Project="eglib-common.targets" />
+  <Import Project="eglib-win32.targets" />
+  <Import Project="eglib-posix.targets" />
   <ItemGroup>
     <ProjectReference Include="build-init.vcxproj">
       <Project>{92ae7622-5f58-4234-9a26-9ec71876b3f4}</Project>
@@ -199,4 +164,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/msvc/eglib.vcxproj.filters b/msvc/eglib.vcxproj.filters
index f49e42ae159..e2ed0ac9a40 100644
--- a/msvc/eglib.vcxproj.filters
+++ b/msvc/eglib.vcxproj.filters
@@ -1,108 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\eglib\src\garray.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\garray.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gbytearray.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gbytearray.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gdate-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gdate-win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gdir-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gdir-win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gerror.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gerror.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gfile.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gfile-posix.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile-posix.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gfile-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile-win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\ghashtable.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\ghashtable.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\giconv.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\giconv.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\glist.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\glist.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gmarkup.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmarkup.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gmem.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmem.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gmisc-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmisc-win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gqueue.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmodule-win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gmodule-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\goutput.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\goutput.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gpath.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gpath.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gpattern.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gpattern.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gptrarray.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gptrarray.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gqsort.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gqsort.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gqueue.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gshell.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gshell.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gslist.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gslist.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gspawn.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gspawn.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gstr.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gstr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gstring.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gstring.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gtimer-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gtimer-win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gunicode.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gunicode.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gutf8.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gunicode-win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\eglib\src\gunicode-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gutf8.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\eglib\src\glib.h">
+    <ClInclude Include="$(MonoSourceLocation)\eglib\src\glib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\eglib\src\gmodule.h">
+    <ClInclude Include="$(MonoSourceLocation)\eglib\src\gmodule.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\eglib\src\sort.frag.h">
+    <ClInclude Include="$(MonoSourceLocation)\eglib\src\gmodule-win32-internals.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\eglib\src\gmodule-win32-internals.h">
+    <ClInclude Include="$(MonoSourceLocation)\eglib\src\sort.frag.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -122,4 +122,4 @@
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/msvc/mono.props b/msvc/mono.props
index abc81a55abd..4ef38268b18 100644
--- a/msvc/mono.props
+++ b/msvc/mono.props
@@ -17,7 +17,8 @@
     <MONO_USE_STATIC_LIBMONO>false</MONO_USE_STATIC_LIBMONO>
   </PropertyGroup>
   <PropertyGroup Label="MonoDirectories">
-    <top_srcdir>$(MSBuildProjectDirectory)/..</top_srcdir>
+    <MonoSourceLocation Condition="'$(MonoSourceLocation)' == '' ">..</MonoSourceLocation>
+    <top_srcdir>$(MSBuildProjectDirectory)/$(MonoSourceLocation)</top_srcdir>
     <MONO_DIR>$(top_srcdir)</MONO_DIR>
     <MONO_INCLUDE_DIR>$(MONO_DIR)/mono</MONO_INCLUDE_DIR>
     <MONO_EGLIB_INCLUDE_DIR>$(MONO_DIR)/eglib;$(MONO_DIR)/eglib/include;$(MONO_DIR)/eglib/test</MONO_EGLIB_INCLUDE_DIR>
@@ -103,4 +104,4 @@
       <AdditionalLibraryDirectories>$(MONO_BUILD_DIR_PREFIX)$(Platform)/lib/$(Configuration)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
-</Project>
\ No newline at end of file
+</Project>