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

Imported Upstream version 5.8.0.22

Browse Source 
Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
msvc/Makefile.in
View File

@@ -130,6 +130,7 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BOEHM_DEFINES = @BOEHM_DEFINES@
BREAKPOINT = @BREAKPOINT@
BTLS_ARCH = @BTLS_ARCH@
BTLS_CFLAGS = @BTLS_CFLAGS@
BTLS_CMAKE_ARGS = @BTLS_CMAKE_ARGS@
@@ -170,12 +171,27 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GINT_TO_POINTER = @GINT_TO_POINTER@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GNUC_NORETURN = @GNUC_NORETURN@
GNUC_PRETTY = @GNUC_PRETTY@
GNUC_UNUSED = @GNUC_UNUSED@
GPOINTER_TO_INT = @GPOINTER_TO_INT@
GPOINTER_TO_UINT = @GPOINTER_TO_UINT@
GREP = @GREP@
GSIZE = @GSIZE@
GSIZE_FORMAT = @GSIZE_FORMAT@
GTKX11 = @GTKX11@
GUINT_TO_POINTER = @GUINT_TO_POINTER@
G_GINT32_FORMAT = @G_GINT32_FORMAT@
G_GINT64_FORMAT = @G_GINT64_FORMAT@
G_GUINT32_FORMAT = @G_GUINT32_FORMAT@
G_GUINT64_FORMAT = @G_GUINT64_FORMAT@
G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
@@ -220,6 +236,8 @@ NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
ORDER = @ORDER@
OS = @OS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
@@ -229,15 +247,19 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATHSEP = @PATHSEP@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIDTYPE = @PIDTYPE@
PKG_CONFIG = @PKG_CONFIG@
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
RANLIB = @RANLIB@
SEARCHSEP = @SEARCHSEP@
SED = @SED@
SET_MAKE = @SET_MAKE@
SGEN_DEFINES = @SGEN_DEFINES@
SHARED_CFLAGS = @SHARED_CFLAGS@
SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STRIP = @STRIP@
@@ -310,6 +332,7 @@ mkdir_p = @mkdir_p@
mono_build_root = @mono_build_root@
mono_cfg_dir = @mono_cfg_dir@
mono_runtime = @mono_runtime@
ninja = @ninja@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@

10
msvc/eglib.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">
@@ -83,7 +83,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
@@ -101,7 +101,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
@@ -120,7 +120,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
@@ -141,7 +141,7 @@
</Midl>
<ClCompile>
<Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>

1
msvc/libmono-static.vcxproj
View File

@@ -138,6 +138,7 @@
<ClCompile Include="..\mono\mini\type-checking.c" />
<ClCompile Include="..\mono\mini\lldb.c" />
<ClCompile Include="..\mono\mini\interp\interp-stubs.c" />
<ClCompile Include="..\mono\mini\mini-profiler.c" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{CB0D9E92-293C-439C-9AC7-C5F59B6E0772}</ProjectGuid>

3
msvc/libmonoruntime.vcxproj
View File

@@ -191,6 +191,7 @@
<ClInclude Include="..\mono\metadata\object-internals.h" />
<ClInclude Include="..\mono\metadata\object.h" />
<ClInclude Include="..\mono\metadata\opcodes.h" />
<ClInclude Include="..\mono\metadata\profiler-events.h" />
<ClInclude Include="..\mono\metadata\profiler-private.h" />
<ClInclude Include="..\mono\metadata\profiler.h" />
<ClInclude Include="..\mono\metadata\rand.h" />
@@ -369,4 +370,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

4
msvc/libmonoutils.vcxproj
View File

@@ -68,6 +68,7 @@
<ClCompile Include="..\mono\utils\mono-mmap-windows.c" />
<ClCompile Include="..\mono\utils\mono-mmap.c" />
<ClCompile Include="..\mono\utils\mono-networkinterfaces.c" />
<ClCompile Include="..\mono\utils\mono-os-wait-win32.c" />
<ClCompile Include="..\mono\utils\mono-proclib-windows.c" />
<ClCompile Include="..\mono\utils\mono-rand-windows.c" />
<ClCompile Include="..\mono\utils\mono-rand.c" />
@@ -109,6 +110,7 @@
<ClCompile Include="..\mono\utils\mono-uri.c" />
<ClCompile Include="..\mono\utils\mono-value-hash.c" />
<ClCompile Include="..\mono\utils\monobitset.c" />
<ClCompile Include="..\mono\utils\mono-os-mutex.c" />
<ClCompile Include="..\mono\utils\os-event-win32.c" />
<ClCompile Include="..\mono\utils\strenc.c" />
<ClCompile Include="..\mono\utils\atomic.c" />
@@ -164,6 +166,7 @@
<ClInclude Include="..\mono\utils\mono-once.h" />
<ClInclude Include="..\mono\utils\mono-os-mutex.h" />
<ClInclude Include="..\mono\utils\mono-os-semaphore.h" />
<ClInclude Include="..\mono\utils\mono-os-wait.h" />
<ClInclude Include="..\mono\utils\mono-path.h" />
<ClInclude Include="..\mono\utils\mono-poll.h" />
<ClInclude Include="..\mono\utils\mono-proclib-windows-internals.h" />
@@ -188,6 +191,7 @@
<ClInclude Include="..\mono\utils\strenc.h" />
<ClInclude Include="..\mono\utils\valgrind.h" />
<ClInclude Include="..\mono\utils\atomic.h" />
<ClInclude Include="..\mono\utils\unlocked.h" />
<ClInclude Include="..\mono\utils\mono-hwcap.h" />
<ClInclude Include="..\mono\utils\mono-hwcap-x86.h" />
<ClInclude Include="..\mono\utils\bsearch.h" />

144
msvc/mono.def
View File

@@ -2,7 +2,6 @@
EXPORTS
MonoFixupCorEE
mono_add_internal_call
mono_aot_get_method
mono_aot_register_module
mono_array_addr_with_size
mono_array_class_get
@@ -31,6 +30,7 @@ mono_assembly_load_from
mono_assembly_load_from_full
mono_assembly_load_full
mono_assembly_load_module
mono_assembly_load_module_checked
mono_assembly_load_reference
mono_assembly_load_references
mono_assembly_load_with_partial_name
@@ -87,6 +87,7 @@ mono_class_from_typeref
mono_class_from_typeref_checked
mono_class_get
mono_class_get_byref_type
mono_class_get_context
mono_class_get_element_class
mono_class_get_event_token
mono_class_get_events
@@ -137,6 +138,7 @@ mono_code_manager_cleanup
mono_code_manager_commit
mono_code_manager_destroy
mono_code_manager_init
mono_code_manager_install_callbacks
mono_code_manager_invalidate
mono_code_manager_new
mono_code_manager_new_dynamic
@@ -147,6 +149,7 @@ mono_code_manager_size
mono_compile_method
mono_conc_hashtable_destroy
mono_conc_hashtable_foreach
mono_conc_hashtable_foreach_steal
mono_conc_hashtable_insert
mono_conc_hashtable_lookup
mono_conc_hashtable_new
@@ -154,6 +157,9 @@ mono_conc_hashtable_new_full
mono_conc_hashtable_remove
mono_config_cleanup
mono_config_for_assembly
mono_config_get_cpu
mono_config_get_os
mono_config_get_wordsize
mono_config_is_server_mode
mono_config_parse
mono_config_parse_memory
@@ -180,6 +186,7 @@ mono_counters_on_register
mono_counters_register
mono_counters_register_with_size
mono_counters_sample
mono_cpu_count
mono_custom_attrs_construct
mono_custom_attrs_free
mono_custom_attrs_from_assembly
@@ -324,11 +331,13 @@ mono_g_hash_table_replace
mono_g_hash_table_size
mono_gc_collect
mono_gc_collection_count
mono_gc_finalize_notify
mono_gc_get_generation
mono_gc_get_heap_size
mono_gc_get_used_size
mono_gc_invoke_finalizers
mono_gc_max_generation
mono_gc_pending_finalizers
mono_gc_reference_queue_add
mono_gc_reference_queue_free
mono_gc_reference_queue_new
@@ -404,7 +413,6 @@ mono_get_int16_class
mono_get_int32_class
mono_get_int64_class
mono_get_intptr_class
mono_get_jit_info_from_method
mono_get_machine_config
mono_get_method
mono_get_method_constrained
@@ -423,6 +431,7 @@ mono_get_uintptr_class
mono_get_void_class
mono_guid_to_string
mono_guid_to_string_minimal
mono_hazard_pointer_get
mono_image_add_to_name_cache
mono_image_addref
mono_image_close
@@ -491,6 +500,11 @@ mono_jit_set_trace_options
mono_jit_thread_attach
mono_ldstr
mono_ldtoken
mono_lls_find
mono_lls_get_hazardous_pointer_with_mask
mono_lls_init
mono_lls_insert
mono_lls_remove
mono_load_remote_field
mono_load_remote_field_new
mono_loader_register_module
@@ -505,12 +519,6 @@ mono_lock_free_queue_init
mono_lock_free_queue_node_init
mono_lock_free_queue_node_unpoison
mono_locks_dump
mono_log_close_logfile
mono_log_close_syslog
mono_log_open_logfile
mono_log_open_syslog
mono_log_write_logfile
mono_log_write_syslog
mono_lookup_icall_symbol
mono_lookup_internal_call
mono_lookup_pinvoke_call
@@ -521,6 +529,8 @@ mono_md5_get_digest
mono_md5_get_digest_from_file
mono_md5_init
mono_md5_update
mono_mem_account_register_counters
mono_mem_account_type_name
mono_mempool_alloc
mono_mempool_alloc0
mono_mempool_contains_addr
@@ -607,6 +617,7 @@ mono_method_desc_search_in_class
mono_method_desc_search_in_image
mono_method_full_name
mono_method_get_class
mono_method_get_context
mono_method_get_flags
mono_method_get_generic_container
mono_method_get_header
@@ -629,6 +640,7 @@ mono_method_header_get_locals
mono_method_header_get_num_clauses
mono_method_print_code
mono_method_signature
mono_method_signature_checked
mono_method_verify
mono_mlist_alloc
mono_mlist_append
@@ -647,7 +659,11 @@ mono_monitor_enter_v4
mono_monitor_exit
mono_monitor_try_enter
mono_mprotect
mono_native_getrootdir
mono_native_thread_create
mono_native_thread_id_equals
mono_native_thread_id_get
mono_native_thread_join
mono_native_thread_set_name
mono_object_castclass_mbyref
mono_object_clone
@@ -686,40 +702,81 @@ mono_print_method_from_ip
mono_print_thread_dump
mono_print_thread_dump_from_ctx
mono_print_unhandled_exception
mono_profiler_coverage_get
mono_profiler_get_events
mono_profiler_call_context_free_buffer
mono_profiler_call_context_get_argument
mono_profiler_call_context_get_local
mono_profiler_call_context_get_result
mono_profiler_call_context_get_this
mono_profiler_create
mono_profiler_enable_allocations
mono_profiler_enable_call_context_introspection
mono_profiler_enable_sampling
mono_profiler_get_coverage_data
mono_profiler_get_sample_mode
mono_profiler_install
mono_profiler_install_allocation
mono_profiler_install_appdomain
mono_profiler_install_appdomain_name
mono_profiler_install_assembly
mono_profiler_install_class
mono_profiler_install_code_buffer_new
mono_profiler_install_code_chunk_destroy
mono_profiler_install_code_chunk_new
mono_profiler_install_context
mono_profiler_install_coverage_filter
mono_profiler_install_enter_leave
mono_profiler_install_exception
mono_profiler_install_gc
mono_profiler_install_gc_moves
mono_profiler_install_gc_roots
mono_profiler_install_iomap
mono_profiler_install_jit_compile
mono_profiler_install_jit_end
mono_profiler_install_method_free
mono_profiler_install_method_invoke
mono_profiler_install_module
mono_profiler_install_monitor
mono_profiler_install_runtime_initialized
mono_profiler_install_statistical
mono_profiler_install_statistical_call_chain
mono_profiler_install_thread
mono_profiler_install_thread_name
mono_profiler_install_transition
mono_profiler_load
mono_profiler_set_assembly_loaded_callback
mono_profiler_set_assembly_loading_callback
mono_profiler_set_assembly_unloaded_callback
mono_profiler_set_assembly_unloading_callback
mono_profiler_set_call_instrumentation_filter_callback
mono_profiler_set_class_failed_callback
mono_profiler_set_class_loaded_callback
mono_profiler_set_class_loading_callback
mono_profiler_set_context_loaded_callback
mono_profiler_set_context_unloaded_callback
mono_profiler_set_coverage_filter_callback
mono_profiler_set_domain_loaded_callback
mono_profiler_set_domain_loading_callback
mono_profiler_set_domain_name_callback
mono_profiler_set_domain_unloaded_callback
mono_profiler_set_domain_unloading_callback
mono_profiler_set_events
mono_profiler_set_statistical_mode
mono_profiler_set_exception_clause_callback
mono_profiler_set_exception_throw_callback
mono_profiler_set_gc_allocation_callback
mono_profiler_set_gc_event_callback
mono_profiler_set_gc_finalized_callback
mono_profiler_set_gc_finalized_object_callback
mono_profiler_set_gc_finalizing_callback
mono_profiler_set_gc_finalizing_object_callback
mono_profiler_set_gc_handle_created_callback
mono_profiler_set_gc_handle_deleted_callback
mono_profiler_set_gc_moves_callback
mono_profiler_set_gc_resize_callback
mono_profiler_set_gc_roots_callback
mono_profiler_set_image_failed_callback
mono_profiler_set_image_loaded_callback
mono_profiler_set_image_loading_callback
mono_profiler_set_image_unloaded_callback
mono_profiler_set_image_unloading_callback
mono_profiler_set_iomap_report_callback
mono_profiler_set_jit_begin_callback
mono_profiler_set_jit_chunk_created_callback
mono_profiler_set_jit_chunk_destroyed_callback
mono_profiler_set_jit_code_buffer_callback
mono_profiler_set_jit_done_callback
mono_profiler_set_jit_failed_callback
mono_profiler_set_method_begin_invoke_callback
mono_profiler_set_method_end_invoke_callback
mono_profiler_set_method_enter_callback
mono_profiler_set_method_exception_leave_callback
mono_profiler_set_method_free_callback
mono_profiler_set_method_leave_callback
mono_profiler_set_monitor_acquired_callback
mono_profiler_set_monitor_contention_callback
mono_profiler_set_monitor_failed_callback
mono_profiler_set_runtime_initialized_callback
mono_profiler_set_runtime_shutdown_begin_callback
mono_profiler_set_runtime_shutdown_end_callback
mono_profiler_set_sample_hit_callback
mono_profiler_set_sample_mode
mono_profiler_set_thread_name_callback
mono_profiler_set_thread_started_callback
mono_profiler_set_thread_stopped_callback
mono_property_get_flags
mono_property_get_get_method
mono_property_get_name
@@ -795,6 +852,7 @@ mono_shared_area_instances
mono_shared_area_remove
mono_shared_area_unload
mono_signature_explicit_this
mono_signature_full_name
mono_signature_get_call_conv
mono_signature_get_desc
mono_signature_get_param_count
@@ -812,6 +870,8 @@ mono_stack_walk_no_il
mono_store_remote_field
mono_store_remote_field_new
mono_string_chars
mono_string_empty
mono_string_empty_wrapper
mono_string_equal
mono_string_from_bstr
mono_string_from_utf16
@@ -820,8 +880,6 @@ mono_string_hash
mono_string_intern
mono_string_is_interned
mono_string_length
mono_string_empty
mono_string_empty_wrapper
mono_string_new
mono_string_new_len
mono_string_new_size
@@ -845,8 +903,13 @@ mono_thread_get_main
mono_thread_get_managed_id
mono_thread_get_name_utf8
mono_thread_get_undeniable_exception
mono_thread_hazardous_queue_free
mono_thread_hazardous_try_free
mono_thread_hazardous_try_free_all
mono_thread_info_detach
mono_thread_info_get_small_id
mono_thread_info_register_small_id
mono_thread_info_yield
mono_thread_init
mono_thread_is_foreign
mono_thread_manage
@@ -872,11 +935,10 @@ mono_threads_request_thread_dump
mono_threads_set_default_stacksize
mono_trace_set_level_string
mono_trace_set_log_handler
mono_trace_set_logdest_string
mono_trace_set_logheader_string
mono_trace_set_mask_string
mono_trace_set_print_handler
mono_trace_set_printerr_handler
mono_tracev_inner
mono_type_create_from_typespec
mono_type_full_name
mono_type_generic_inst_is_valuetype
@@ -892,6 +954,7 @@ mono_type_get_type
mono_type_get_underlying_type
mono_type_is_byref
mono_type_is_pointer
mono_type_is_primitive
mono_type_is_reference
mono_type_is_struct
mono_type_is_valid_enum_basetype
@@ -908,6 +971,7 @@ mono_utf8_validate_and_len
mono_utf8_validate_and_len_with_bounds
mono_valloc
mono_valloc_aligned
mono_valloc_granule
mono_value_box
mono_value_copy
mono_value_copy_array

6
msvc/mono.props
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<!-- Change this to custom build tree location to enable out of source tree builds, example c:/mono-build/ -->
@@ -21,8 +21,8 @@
<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>
<MONO_EGLIB_SOURCE_DIR>$(MONO_DIR)/eglib/src</MONO_EGLIB_SOURCE_DIR>
<MONO_EGLIB_INCLUDE_DIR>$(MONO_DIR)/mono/eglib</MONO_EGLIB_INCLUDE_DIR>
<MONO_EGLIB_SOURCE_DIR>$(MONO_DIR)/mono/eglib</MONO_EGLIB_SOURCE_DIR>
<MONO_LIBGC_INCLUDE_DIR>$(MONO_DIR)/libgc/include</MONO_LIBGC_INCLUDE_DIR>
<MONO_LIBGC_SOURCE_DIR>$(MONO_DIR)/libgc/src</MONO_LIBGC_SOURCE_DIR>
<MONO_JIT_INCLUDE_DIR>$(MONO_INCLUDE_DIR)/jit</MONO_JIT_INCLUDE_DIR>

4
msvc/profiler-vtune.vcxproj
View File

@@ -182,7 +182,7 @@
</ProjectReference>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\mono\profiler\mono-profiler-vtune.c" />
<ClCompile Include="..\mono\profiler\vtune.c" />
</ItemGroup>
<ItemGroup>
<None Include="mono-profiler-vtune.def" />
@@ -204,4 +204,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

66
msvc/test_eglib.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">
@@ -85,7 +85,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -112,7 +112,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -137,7 +137,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -165,7 +165,7 @@
</Midl>
<ClCompile>
<Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -183,40 +183,40 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\eglib\test\array.c" />
<ClCompile Include="..\eglib\test\dir.c" />
<ClCompile Include="..\eglib\test\driver.c" />
<ClCompile Include="..\eglib\test\endian.c" />
<ClCompile Include="..\eglib\test\fake.c" />
<ClCompile Include="..\eglib\test\file.c" />
<ClCompile Include="..\mono\eglib\test\array.c" />
<ClCompile Include="..\mono\eglib\test\dir.c" />
<ClCompile Include="..\mono\eglib\test\driver.c" />
<ClCompile Include="..\mono\eglib\test\endian.c" />
<ClCompile Include="..\mono\eglib\test\fake.c" />
<ClCompile Include="..\mono\eglib\test\file.c" />
<ClCompile Include="getopt.c" />
<ClCompile Include="getopt_long.c" />
<ClCompile Include="..\eglib\test\hashtable.c" />
<ClCompile Include="..\eglib\test\list.c" />
<ClCompile Include="..\eglib\test\markup.c" />
<ClCompile Include="..\eglib\test\memory.c" />
<ClCompile Include="..\eglib\test\module.c" />
<ClCompile Include="..\eglib\test\path.c" />
<ClCompile Include="..\eglib\test\pattern.c" />
<ClCompile Include="..\eglib\test\ptrarray.c" />
<ClCompile Include="..\eglib\test\queue.c" />
<ClCompile Include="..\eglib\test\shell.c" />
<ClCompile Include="..\eglib\test\sizes.c" />
<ClCompile Include="..\eglib\test\slist.c" />
<ClCompile Include="..\eglib\test\spawn.c" />
<ClCompile Include="..\eglib\test\string-util.c" />
<ClCompile Include="..\eglib\test\string.c" />
<ClCompile Include="..\eglib\test\test.c" />
<ClCompile Include="..\eglib\test\timer.c" />
<ClCompile Include="..\eglib\test\unicode.c" />
<ClCompile Include="..\eglib\test\utf8.c" />
<ClCompile Include="..\mono\eglib\test\hashtable.c" />
<ClCompile Include="..\mono\eglib\test\list.c" />
<ClCompile Include="..\mono\eglib\test\markup.c" />
<ClCompile Include="..\mono\eglib\test\memory.c" />
<ClCompile Include="..\mono\eglib\test\module.c" />
<ClCompile Include="..\mono\eglib\test\path.c" />
<ClCompile Include="..\mono\eglib\test\pattern.c" />
<ClCompile Include="..\mono\eglib\test\ptrarray.c" />
<ClCompile Include="..\mono\eglib\test\queue.c" />
<ClCompile Include="..\mono\eglib\test\shell.c" />
<ClCompile Include="..\mono\eglib\test\sizes.c" />
<ClCompile Include="..\mono\eglib\test\slist.c" />
<ClCompile Include="..\mono\eglib\test\spawn.c" />
<ClCompile Include="..\mono\eglib\test\string-util.c" />
<ClCompile Include="..\mono\eglib\test\string.c" />
<ClCompile Include="..\mono\eglib\test\test.c" />
<ClCompile Include="..\mono\eglib\test\timer.c" />
<ClCompile Include="..\mono\eglib\test\unicode.c" />
<ClCompile Include="..\mono\eglib\test\utf8.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="getopt.h" />
<ClInclude Include="getopt_long.h" />
<ClInclude Include="..\eglib\src\glib.h" />
<ClInclude Include="..\eglib\test\test.h" />
<ClInclude Include="..\eglib\test\tests.h" />
<ClInclude Include="..\mono\eglib\src\glib.h" />
<ClInclude Include="..\mono\eglib\test\test.h" />
<ClInclude Include="..\mono\eglib\test\tests.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="eglib.vcxproj">

13
msvc/winsetup.bat
View File

@@ -1,11 +1,8 @@
@ECHO off
SET CONFIG_H=..\config.h
SET EGLIB_CONFIG_H=..\eglib\config.h
SET CYG_CONFIG_H=..\cygconfig.h
SET EGLIB_CYG_CONFIG_H=..\eglib\cygconfig.h
SET WIN_CONFIG_H=..\winconfig.h
SET EGLIB_WIN_CONFIG_H=..\eglib\winconfig.h
SET CONFIGURE_AC=..\configure.ac
SET VERSION_H=..\mono\mini\version.h
@@ -14,7 +11,6 @@ ECHO Setting up Mono configuration headers...
REM Backup existing config.h into cygconfig.h if its not already replaced.
%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File backup-config-files.ps1 %CONFIG_H% %CYG_CONFIG_H% 2>&1
%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File backup-config-files.ps1 %EGLIB_CONFIG_H% %EGLIB_CYG_CONFIG_H% 2>&1
%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File compare-config-files.ps1 %WIN_CONFIG_H% %CONFIG_H% %CONFIGURE_AC% 2>&1
@@ -22,14 +18,7 @@ IF NOT %ERRORLEVEL% == 0 (
ECHO copy %WIN_CONFIG_H% %CONFIG_H%
copy %WIN_CONFIG_H% %CONFIG_H%
%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -NonInteractive -Command "(Get-Content %CONFIG_H%) -replace '#MONO_VERSION#', (Select-String -path %CONFIGURE_AC% -pattern 'AC_INIT\(mono, \[(.*)\]').Matches[0].Groups[1].Value | Set-Content %CONFIG_H%" 2>&1
%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -NonInteractive -Command "$mono_version=[int[]](Select-String -path %CONFIGURE_AC% -pattern 'AC_INIT\(mono, \[(.*)\]').Matches[0].Groups[1].Value.Split('.'); $corlib_counter=[int](Select-String -path %CONFIGURE_AC% -pattern 'MONO_CORLIB_COUNTER=(.*)').Matches[0].Groups[1].Value; (Get-Content %CONFIG_H%) -replace '#MONO_CORLIB_VERSION#',('1{0:00}{1:00}{2:00}{3:000}' -f $mono_version[0],$mono_version[1],$mono_version[2],$corlib_counter) | Set-Content %CONFIG_H%" 2>&1
)
%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File compare-config-files.ps1 %EGLIB_WIN_CONFIG_H% %EGLIB_CONFIG_H% 2>&1
IF NOT %ERRORLEVEL% == 0 (
ECHO copy %EGLIB_WIN_CONFIG_H% %EGLIB_CONFIG_H%
copy %EGLIB_WIN_CONFIG_H% %EGLIB_CONFIG_H%
%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -NonInteractive -Command "$mono_version=[int[]](Select-String -path %CONFIGURE_AC% -pattern 'AC_INIT\(mono, \[(.*)\]').Matches[0].Groups[1].Value.Split('.'); $corlib_counter=[int](Select-String -path %CONFIGURE_AC% -pattern 'MONO_CORLIB_COUNTER=(.*)').Matches[0].Groups[1].Value; (Get-Content %CONFIG_H%) -replace '#MONO_CORLIB_VERSION#',('1{0:00}{1:00}{2:00}{3:000}' -f $mono_version[0],$mono_version[1],0,$corlib_counter) | Set-Content %CONFIG_H%" 2>&1
)
SET VERSION_CONTENT="#define FULL_VERSION \"Visual Studio built mono\""