Compare commits

...
4 Commits
Author SHA1 Message Date
Zoltan Varga b28e8eb771 Merge from HEAD.
svn path=/branches/mono-1-1-11/mono/; revision=54443
2005-12-15 11:01:35 +00:00
Wade Berrier 2b18ed7e05 unset AC_DISABLE_FAST_INSTALL
svn path=/branches/mono-1-1-11/mono/; revision=54438
2005-12-15 04:29:41 +00:00
Wade Berrier d4acb77ad9 fix xbuild make install with EXTRA_DISTFILES
svn path=/branches/mono-1-1-11/mcs/; revision=54434
2005-12-15 01:28:58 +00:00
Wade Berrier d840a80749 Merge r54425 to mcs 1.1.11 branch
svn path=/branches/mono-1-1-11/mcs/; revision=54426
2005-12-15 00:13:41 +00:00
8 changed files with 33 additions and 2 deletions

No files matched your search

+4
View File
@@ -1,3 +1,7 @@
2005-12-14 Wade Berrier <[email protected]>
* configure.in (AC_DISABLE_FAST_INSTALL): unset.
2005-12-12 Mike Kestner <[email protected]>
* mono-cairo.pc.in: pkgconfig support for Mono.Cairo. Mono.Cairo.dll
+3 -1
View File
@@ -263,7 +263,9 @@ AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes])
# Set STDC_HEADERS
AC_HEADER_STDC
AC_LIBTOOL_WIN32_DLL
AC_DISABLE_FAST_INSTALL
# Disabling because it causes some weird monodis linking
# problems if /usr/libmono.so isn't install on system
#AC_DISABLE_FAST_INSTALL
AM_PROG_LIBTOOL
# Test whenever ld supports -version-script
@@ -1,3 +1,7 @@
2005-12-14 Wade Berrier <[email protected]>
* Makefile: Added EXTRA_DISTFILES to fix make dist build
2005-09-25 Marek Sieradzki <[email protected]>
* Mono.XBuild.Shared: Moved to Mono.XBuild.Framework to be consistent.
@@ -16,3 +16,6 @@ LIB_MCS_FLAGS = \
/r:System.dll
include ../../build/library.make
EXTRA_DISTFILES = \
Mono.XBuild.Framework/AssemblyLoadInfo.cs
+4
View File
@@ -1,3 +1,7 @@
2005-12-14 Wade Berrier <[email protected]>
* Makefile: Add missing EXTRA_DISTFILES in order to 'make install'
2005-11-05 Kornél Pál <[email protected]>
* AssemblyInfo.cs: Use Consts.MonoVersion as AssemblyVersion.
+7
View File
@@ -10,6 +10,13 @@ include ../../build/executable.make
install-local: install-extras
EXTRAS_DIR = $(mono_libdir)/mono/xbuild
EXTRA_DISTFILES = \
xbuild/xbuild.rsp \
xbuild/Microsoft.Common.tasks \
xbuild/Microsoft.Build.xsd \
xbuild/MSBuild/Microsoft.Build.Commontypes.xsd \
xbuild/MSBuild/Microsoft.Build.Core.xsd
install-extras:
$(MKINSTALLDIRS) $(DESTDIR)$(EXTRAS_DIR)
$(INSTALL_DATA) xbuild/xbuild.rsp $(DESTDIR)$(EXTRAS_DIR)
+4
View File
@@ -1,3 +1,7 @@
2005-12-15 Zoltan Varga <[email protected]>
* class.c (mono_class_setup_vtable): Call mono_reflection_get_dynamic_overrides () for dynamic classes.
2005-12-14 Zoltan Varga <[email protected]>
* loader.c (mono_loader_set_error_type_load): Print the type load
+4 -1
View File
@@ -1553,7 +1553,10 @@ mono_class_setup_vtable (MonoClass *class)
else
context = (MonoGenericContext *) class->generic_container;
mono_class_get_overrides_full (class->image, class->type_token, &overrides, &onum, context);
if (class->image->dynamic)
mono_reflection_get_dynamic_overrides (class, &overrides, &onum);
else
mono_class_get_overrides_full (class->image, class->type_token, &overrides, &onum, context);
mono_class_setup_vtable_general (class, overrides, onum);
g_free (overrides);