mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.4.0.167

Browse Source 
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
msvc/Makefile.in
View File

@@ -213,7 +213,6 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MONO_CORLIB_VERSION = @MONO_CORLIB_VERSION@
MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -311,7 +310,6 @@ mkdir_p = @mkdir_p@
mono_build_root = @mono_build_root@
mono_cfg_dir = @mono_cfg_dir@
mono_runtime = @mono_runtime@
nacl_self_host = @nacl_self_host@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@

43
msvc/eglib.vcxproj
View File

@@ -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>
</Project>

4
msvc/libmono-static.vcxproj
View File

@@ -48,6 +48,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\mono\mini\mini.c" />
<ClCompile Include="..\mono\mini\memory-access.c" />
<ClInclude Include="..\mono\metadata\remoting.h" />
<ClInclude Include="..\mono\mini\ir-emit.h" />
<ClCompile Include="..\mono\mini\method-to-ir.c" />
@@ -136,6 +137,7 @@
<ClCompile Include="..\mono\mini\mini-native-types.c" />
<ClCompile Include="..\mono\mini\type-checking.c" />
<ClCompile Include="..\mono\mini\lldb.c" />
<ClCompile Include="..\mono\mini\interp\interp-stubs.c" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{CB0D9E92-293C-439C-9AC7-C5F59B6E0772}</ProjectGuid>
@@ -333,4 +335,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

5
msvc/libmonoruntime.vcxproj
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -75,9 +75,9 @@
<ClCompile Include="..\mono\metadata\mono-debug.c" />
<ClCompile Include="..\mono\metadata\mono-endian.c" />
<ClCompile Include="..\mono\metadata\mono-hash.c" />
<ClCompile Include="..\mono\metadata\mono-conc-hash.c" />
<ClCompile Include="..\mono\metadata\mono-mlist.c" />
<ClCompile Include="..\mono\metadata\mono-perfcounters.c" />
<ClCompile Include="..\mono\metadata\nacl-stub.c" />
<ClCompile Include="..\mono\metadata\null-gc.c" />
<ClCompile Include="..\mono\metadata\number-ms.c" />
<ClCompile Include="..\mono\metadata\object.c" />
@@ -181,6 +181,7 @@
<ClInclude Include="..\mono\metadata\mono-debug.h" />
<ClInclude Include="..\mono\metadata\mono-endian.h" />
<ClInclude Include="..\mono\metadata\mono-hash.h" />
<ClInclude Include="..\mono\metadata\mono-conc-hash.h" />
<ClInclude Include="..\mono\metadata\mono-mlist.h" />
<ClInclude Include="..\mono\metadata\mono-perfcounters-def.h" />
<ClInclude Include="..\mono\metadata\mono-perfcounters.h" />

1
msvc/mono.def
View File

@@ -243,7 +243,6 @@ mono_dl_fallback_register
mono_dl_fallback_unregister
mono_dl_open
mono_dllmap_insert
mono_domain_add_class_static_data
mono_domain_assembly_open
mono_domain_create
mono_domain_create_appdomain

5
msvc/mono.props
View File

@@ -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>
</Project>