Imported Upstream version 2.10upstream/2.10

5 files changed, 147 insertions, 2 deletions

diff --git a/msvc/ChangeLog b/msvc/ChangeLog
index 711373edff..cc7eaa9d8a 100644
--- a/msvc/ChangeLog
+++ b/msvc/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-19  Andrew Jorgensen  <ajorgensen@novell.com>
+
+	Dist more files needed by MSVC build
+
 2011-01-11  Geoff Norton  <grompf@sublimeintervention.com>
 
 	Fix the win32 build
diff --git a/msvc/Makefile.am b/msvc/Makefile.am
index 3efb344371..7e9ea66ae0 100644
--- a/msvc/Makefile.am
+++ b/msvc/Makefile.am
@@ -16,7 +16,16 @@ VCPROJS =					\
 
 VCXPROJS = $(wildcard *.vcxproj)
 
-EXTRA_DIST = create-windef.pl mono.def README mono.sln winsetup.bat $(VCPROJS) $(VCXPROJS)
+EXTRA_DIST = \
+	     $(VCPROJS) \
+	     $(VCXPROJS) \
+	     README \
+	     create-windef.pl \
+	     mono.def \
+	     mono.sln \
+	     monoposixhelper.def \
+	     runmdesc.bat \
+	     winsetup.bat
 
 update-def:
 	perl create-windef.pl mono.def
diff --git a/msvc/Makefile.in b/msvc/Makefile.in
index b8c90a7a07..eb25fd02de 100644
--- a/msvc/Makefile.in
+++ b/msvc/Makefile.in
@@ -260,7 +260,17 @@ VCPROJS = \
 	teste.vcproj
 
 VCXPROJS = $(wildcard *.vcxproj)
-EXTRA_DIST = create-windef.pl mono.def README mono.sln winsetup.bat $(VCPROJS) $(VCXPROJS)
+EXTRA_DIST = \
+	     $(VCPROJS) \
+	     $(VCXPROJS) \
+	     README \
+	     create-windef.pl \
+	     mono.def \
+	     mono.sln \
+	     monoposixhelper.def \
+	     runmdesc.bat \
+	     winsetup.bat
+
 all: all-am
 
 .SUFFIXES:
diff --git a/msvc/monoposixhelper.def b/msvc/monoposixhelper.def
new file mode 100644
index 0000000000..fca1c3d1d9
--- /dev/null
+++ b/msvc/monoposixhelper.def
@@ -0,0 +1,100 @@
+LIBRARY MonoPosixHelper.dll

+EXPORTS

+Mono_Posix_FromAccessModes

+Mono_Posix_FromConfstrName

+Mono_Posix_FromDirectoryNotifyFlags

+Mono_Posix_FromErrno

+Mono_Posix_FromFcntlCommand

+Mono_Posix_FromFilePermissions

+Mono_Posix_FromLockType

+Mono_Posix_FromLockfCommand

+Mono_Posix_FromMlockallFlags

+Mono_Posix_FromMmapFlags

+Mono_Posix_FromMmapProts

+Mono_Posix_FromMountFlags

+Mono_Posix_FromMremapFlags

+Mono_Posix_FromMsyncFlags

+Mono_Posix_FromOpenFlags

+Mono_Posix_FromPathconfName

+Mono_Posix_FromPollEvents

+Mono_Posix_FromPosixFadviseAdvice

+Mono_Posix_FromPosixMadviseAdvice

+Mono_Posix_FromSeekFlags

+Mono_Posix_FromSignum

+Mono_Posix_FromSysconfName

+Mono_Posix_FromSyslogFacility

+Mono_Posix_FromSyslogLevel

+Mono_Posix_FromSyslogOptions

+Mono_Posix_FromWaitOptions

+Mono_Posix_FromXattrFlags

+Mono_Posix_Stdlib_BUFSIZ

+Mono_Posix_Stdlib_CreateFilePosition

+Mono_Posix_Stdlib_DumpFilePosition

+Mono_Posix_Stdlib_EOF

+Mono_Posix_Stdlib_EXIT_FAILURE

+Mono_Posix_Stdlib_EXIT_SUCCESS

+Mono_Posix_Stdlib_FILENAME_MAX

+Mono_Posix_Stdlib_FOPEN_MAX

+Mono_Posix_Stdlib_InvokeSignalHandler

+Mono_Posix_Stdlib_L_tmpnam

+Mono_Posix_Stdlib_MB_CUR_MAX

+Mono_Posix_Stdlib_RAND_MAX

+Mono_Posix_Stdlib_SIG_DFL

+Mono_Posix_Stdlib_SIG_ERR

+Mono_Posix_Stdlib_SIG_IGN

+Mono_Posix_Stdlib_SetLastError

+Mono_Posix_Stdlib_TMP_MAX

+Mono_Posix_Stdlib__IOFBF

+Mono_Posix_Stdlib__IOLBF

+Mono_Posix_Stdlib__IONBF

+Mono_Posix_Stdlib_calloc

+Mono_Posix_Stdlib_clearerr

+Mono_Posix_Stdlib_fgetpos

+Mono_Posix_Stdlib_fread

+Mono_Posix_Stdlib_fseek

+Mono_Posix_Stdlib_fsetpos

+Mono_Posix_Stdlib_ftell

+Mono_Posix_Stdlib_fwrite

+Mono_Posix_Stdlib_malloc

+Mono_Posix_Stdlib_perror

+Mono_Posix_Stdlib_realloc

+Mono_Posix_Stdlib_rewind

+Mono_Posix_Stdlib_setbuf

+Mono_Posix_Stdlib_setvbuf

+Mono_Posix_Stdlib_stderr

+Mono_Posix_Stdlib_stdin

+Mono_Posix_Stdlib_stdout

+Mono_Posix_Stdlib_strlen

+Mono_Posix_ToAccessModes

+Mono_Posix_ToConfstrName

+Mono_Posix_ToDirectoryNotifyFlags

+Mono_Posix_ToErrno

+Mono_Posix_ToFcntlCommand

+Mono_Posix_ToFilePermissions

+Mono_Posix_ToLockType

+Mono_Posix_ToLockfCommand

+Mono_Posix_ToMlockallFlags

+Mono_Posix_ToMmapFlags

+Mono_Posix_ToMmapProts

+Mono_Posix_ToMountFlags

+Mono_Posix_ToMremapFlags

+Mono_Posix_ToMsyncFlags

+Mono_Posix_ToOpenFlags

+Mono_Posix_ToPathconfName

+Mono_Posix_ToPollEvents

+Mono_Posix_ToPosixFadviseAdvice

+Mono_Posix_ToPosixMadviseAdvice

+Mono_Posix_ToSeekFlags

+Mono_Posix_ToSignum

+Mono_Posix_ToSysconfName

+Mono_Posix_ToSyslogFacility

+Mono_Posix_ToSyslogLevel

+Mono_Posix_ToSyslogOptions

+Mono_Posix_ToWaitOptions

+Mono_Posix_ToXattrFlags

+CreateZStream

+CloseZStream

+ReadZStream

+WriteZStream

+Flush

+

diff --git a/msvc/runmdesc.bat b/msvc/runmdesc.bat
new file mode 100755
index 0000000000..8d089341ae
--- /dev/null
+++ b/msvc/runmdesc.bat
@@ -0,0 +1,22 @@
+@echo off
+rem This runs genmdesc on the x86 files when called on Visual Studio
+echo Running genmdesc
+cd ..\mono\mini
+set PATH=%PATH%;%MONO_DEPENDENCIES_PREFIX%\bin
+if "%2" == "Win32" goto x86
+if "%2" == "x64" goto x64
+goto error
+:x86
+echo Platform detected is x86...
+%1 cpu-x86.h x86_desc cpu-x86.md
+goto end
+:x64
+echo Platform detected is x64...
+%1 cpu-amd64.h amd64_desc cpu-amd64.md
+goto end
+:error
+echo Error: unsupported platform
+exit /b 100
+:end
+echo done
+