From 337b6aedc73387e0c24ade32a7e20de56c2ac1b2 Mon Sep 17 00:00:00 2001 From: Jonathan Chambers Date: Tue, 13 Mar 2007 18:08:42 +0000 Subject: [PATCH] 2007-03-13 Jonathan Chambers *.vcproj: Fix Release build target, add define to remove CRT warnings, structure output folders a bit better, begin WIN64 port. *.bat: Use output from current VS target for executable. * icall.c: Fix environ access on windows. * gc.h: Fix Win64 typedef. svn path=/trunk/mono/; revision=74191 --- ChangeLog | 7 + genmdesc.vcproj | 311 +++- libgc/ChangeLog | 5 + libgc/include/gc.h | 4 +- libgc/libgc.vcproj | 163 +- libmono.vcproj | 2675 +++++++++++++++++++++++----- mono.sln | 50 + mono.vcproj | 194 +- mono/dis/ChangeLog | 3 + mono/dis/monodis.vcproj | 176 +- mono/metadata/ChangeLog | 4 + mono/metadata/icall.c | 4 +- mono/mini/ChangeLog | 5 + mono/mini/runmdesc.bat | 2 +- mono/monoburg/ChangeLog | 7 + mono/monoburg/monoburg.vcproj | 193 +- mono/monoburg/runburg.bat | 2 +- mono/monodiet.vcproj | 179 +- mono/monograph/ChangeLog | 3 + mono/monograph/monograph.vcproj | 176 +- mono/pedump.vcproj | 179 +- samples/embed/test-invoke.vcproj | 164 ++ samples/embed/test-metadata.vcproj | 165 +- samples/embed/teste.vcproj | 164 ++ 24 files changed, 4256 insertions(+), 579 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec63a86d7f4..4048448cb98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ +2007-03-13 Jonathan Chambers + * libmono.vcproj, mono.vcproj, genmdesc.vcproj, mono/monodiet.vcproj, + mono/pedump.vcproj: Fix Release build target, add define to remove CRT warnings, + structure output folders a bit better, begin WIN64 port, and change + libmono to build a DLL instead of a static library. + * mono.sln: Begin x64 target support. + Fri Mar 9 18:57:47 CET 2007 Paolo Molaro * Makefile.am, configure.in, msvc: add msvc directory to the diff --git a/genmdesc.vcproj b/genmdesc.vcproj index 092a1bf450c..8e7990d6ca8 100644 --- a/genmdesc.vcproj +++ b/genmdesc.vcproj @@ -10,14 +10,17 @@ + @@ -107,13 +106,13 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -234,6 +417,27 @@ UsePrecompiledHeader="0" /> + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libgc/ChangeLog b/libgc/ChangeLog index dc5e6fd2906..ac5acaca9cb 100644 --- a/libgc/ChangeLog +++ b/libgc/ChangeLog @@ -1,3 +1,8 @@ +2007-03-13 Jonathan Chambers + + * include/gc.h: Fix _WIN64 typedefs. + * libgc.vcproj: Fix Release target and begin Win64 port. + 2007-02-01 Geoff Norton * include/private/gc_pthread_redirects.h: diff --git a/libgc/include/gc.h b/libgc/include/gc.h index f7f3f01d779..ba73ea09a55 100644 --- a/libgc/include/gc.h +++ b/libgc/include/gc.h @@ -61,8 +61,8 @@ /* Win64 isn't really supported yet, but this is the first step. And */ /* it might cause error messages to show up in more plausible places. */ /* This needs basetsd.h, which is included by windows.h. */ - typedef ULONG_PTR GC_word; - typedef LONG_PTR GC_word; + typedef unsigned __int64 GC_word; + typedef __int64 GC_signed_word; #endif /* Public read-only variables */ diff --git a/libgc/libgc.vcproj b/libgc/libgc.vcproj index 10ba449f7cb..1cf813da8f7 100644 --- a/libgc/libgc.vcproj +++ b/libgc/libgc.vcproj @@ -11,16 +11,19 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -86,18 +91,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -168,6 +355,12 @@ + + @@ -216,20 +409,8 @@ BrowseInformation="1" /> - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + + + - - + + - - - - - - - - + + + + - - + + - - - - - - - - - - - - + + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + - - - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mono/dis/ChangeLog b/mono/dis/ChangeLog index 67986043f2a..5d32f46e001 100644 --- a/mono/dis/ChangeLog +++ b/mono/dis/ChangeLog @@ -1,4 +1,7 @@ +2007-03-13 Jonathan Chambers + * monodis.vcproj: Begin Win64 port. + Fri Jan 26 12:30:22 CET 2007 Paolo Molaro * get.c, dis-cil.c: warning fixes. diff --git a/mono/dis/monodis.vcproj b/mono/dis/monodis.vcproj index 6f4f58b6121..dc6a2165d6e 100644 --- a/mono/dis/monodis.vcproj +++ b/mono/dis/monodis.vcproj @@ -11,6 +11,9 @@ + @@ -42,13 +45,13 @@ Optimization="0" AdditionalIncludeDirectories="..\..\;..\..\libgc\include;"..\..\VSDependancies\include\glib-2.0\glib";..\..\VSDependancies\include;..\..\mono\;..\..\mono\jit" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__" - MinimalRebuild="TRUE" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" + BufferSecurityCheck="true" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="1" DisableSpecificWarnings="4996;4018;4244" @@ -67,7 +70,7 @@ AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib Psapi.lib" LinkIncremental="1" AdditionalLibraryDirectories="..\..\;..\..\VSDependancies\lib" - GenerateDebugInformation="TRUE" + GenerateDebugInformation="true" SubSystem="1" TargetMachine="1" /> @@ -123,10 +126,10 @@ Optimization="2" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" - BufferSecurityCheck="TRUE" + BufferSecurityCheck="true" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 9d69898dc09..46eb33127ef 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,7 @@ +2007-03-13 Jonathan Chambers + + * icall.c: Fix environ access in VS. + 2007-03-13 Alp Toker * icall.c (ves_icall_MonoType_GetElementType): For enums, return null diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c index cedc649af65..66f929d8b62 100644 --- a/mono/metadata/icall.c +++ b/mono/metadata/icall.c @@ -5653,12 +5653,12 @@ ves_icall_System_Environment_GetEnvironmentVariable (MonoString *name) /* * There is no standard way to get at environ. */ -#ifndef __MINGW32_VERSION #ifndef _MSC_VER +#ifndef __MINGW32_VERSION extern -#endif char **environ; #endif +#endif static MonoArray * ves_icall_System_Environment_GetEnvironmentVariableNames (void) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 250fce778f7..c09b25aef76 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,8 @@ +2007-03-13 Jonathan Chambers + + * runmdesc.bat: Run executable that was produced by the current + target and sent via an argument. + 2007-03-11 Zoltan Varga * mini.c (mono_method_to_ir): Fix box+brtrue optimization. Fixes diff --git a/mono/mini/runmdesc.bat b/mono/mini/runmdesc.bat index 8eb9e7cd949..8bb7a05fc71 100755 --- a/mono/mini/runmdesc.bat +++ b/mono/mini/runmdesc.bat @@ -3,6 +3,6 @@ rem This runs genmdesc on the x86 files when called on Visual Studio echo Running genmdesc on the x86 files... cd mono\mini set PATH=%PATH%;..\..\VSDependancies\lib -..\..\VSDependancies\genmdesc___win32_debug\genmdesc cpu-x86.md cpu-x86.h x86_desc +%1 cpu-x86.md cpu-x86.h x86_desc echo done diff --git a/mono/monoburg/ChangeLog b/mono/monoburg/ChangeLog index 84d538fdfa5..6e4254323cf 100644 --- a/mono/monoburg/ChangeLog +++ b/mono/monoburg/ChangeLog @@ -1,3 +1,10 @@ +2007-03-13 Jonathan Chambers + + * runburg.bat: Run executable that was produced by the current + target and sent via an argument. + * monoburg.vcproj: Fix Release build target, add define to remove CRT warnings, + structure output folders a bit better, begin WIN64 port. + 2007-02-03 Pekka J Enberg * monoburg.c: Let the Monoburg specification override MBState reg1 diff --git a/mono/monoburg/monoburg.vcproj b/mono/monoburg/monoburg.vcproj index b02e9aba026..6fceec1c13c 100644 --- a/mono/monoburg/monoburg.vcproj +++ b/mono/monoburg/monoburg.vcproj @@ -11,14 +11,17 @@ + @@ -42,7 +45,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""..\..\VSDependancies\include\glib-2.0";".\..\VSDependancies\include\glib-2.0\glib";"..\..\VSDependancies\lib\glib-2.0\include";..\..\VSDependancies\include" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -51,6 +54,7 @@ WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" + CompileAs="1" DisableSpecificWarnings="4996" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mono/monoburg/runburg.bat b/mono/monoburg/runburg.bat index b84a56df545..82d435f8034 100755 --- a/mono/monoburg/runburg.bat +++ b/mono/monoburg/runburg.bat @@ -3,6 +3,6 @@ rem This runs Monoburg on the various x86 files when called on Visual Studio echo Running Monoburg on the x86 inssel.brg files... cd ..\mini set PATH=%PATH%;..\..\VSDependancies\lib -..\..\VSDependancies\temp\monoburg\Debug\monoburg -c 1 -p -e inssel.brg inssel-float.brg inssel-long32.brg inssel-x86.brg -d inssel.h -s inssel.c +%1 -c 1 -p -e inssel.brg inssel-float.brg inssel-long32.brg inssel-x86.brg -d inssel.h -s inssel.c echo done diff --git a/mono/monodiet.vcproj b/mono/monodiet.vcproj index dd97cfb9157..ce09cb42c28 100644 --- a/mono/monodiet.vcproj +++ b/mono/monodiet.vcproj @@ -11,6 +11,9 @@ + @@ -42,16 +45,16 @@ Optimization="0" AdditionalIncludeDirectories="..\;..\libgc\include;"..\VSDependancies\include\glib-2.0\glib";..\VSDependancies\include;..\mono\" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__" - MinimalRebuild="TRUE" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" + BufferSecurityCheck="true" UsePrecompiledHeader="0" ObjectFile="$(IntDir)/monodiet/" ProgramDataBaseFileName="$(IntDir)/monodiet/vc80.pdb" XMLDocumentationFileName="$(IntDir)/monodiet/" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="1" DisableSpecificWarnings="4996" @@ -70,7 +73,7 @@ AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib Psapi.lib" LinkIncremental="1" AdditionalLibraryDirectories="..\;..\VSDependancies\lib" - GenerateDebugInformation="TRUE" + GenerateDebugInformation="true" SubSystem="1" TargetMachine="1" /> @@ -126,10 +129,10 @@ Optimization="2" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" - BufferSecurityCheck="TRUE" + BufferSecurityCheck="true" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mono/monograph/ChangeLog b/mono/monograph/ChangeLog index af7aa9a00ef..20ebfc0e869 100644 --- a/mono/monograph/ChangeLog +++ b/mono/monograph/ChangeLog @@ -1,4 +1,7 @@ +2007-03-13 Jonathan Chambers + * monograph.vcproj: Begin WIN64 port. + Fri Jan 26 12:37:14 CET 2007 Paolo Molaro * monograph.c: warning fixes. diff --git a/mono/monograph/monograph.vcproj b/mono/monograph/monograph.vcproj index 649ebc5b29a..26cd59d76ba 100644 --- a/mono/monograph/monograph.vcproj +++ b/mono/monograph/monograph.vcproj @@ -11,6 +11,9 @@ + @@ -42,13 +45,13 @@ Optimization="0" AdditionalIncludeDirectories="..\..\;..\..\libgc\include;"..\..\VSDependancies\include\glib-2.0\glib";..\..\VSDependancies\include;..\..\mono\" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__" - MinimalRebuild="TRUE" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" + BufferSecurityCheck="true" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="1" DisableSpecificWarnings="4996" @@ -67,7 +70,7 @@ AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib Psapi.lib" LinkIncremental="1" AdditionalLibraryDirectories="..\..\;..\..\VSDependancies\lib" - GenerateDebugInformation="TRUE" + GenerateDebugInformation="true" SubSystem="1" TargetMachine="1" /> @@ -123,10 +126,10 @@ Optimization="2" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" - BufferSecurityCheck="TRUE" + BufferSecurityCheck="true" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mono/pedump.vcproj b/mono/pedump.vcproj index bb9110d4c52..8b7b5cccf35 100644 --- a/mono/pedump.vcproj +++ b/mono/pedump.vcproj @@ -11,6 +11,9 @@ + @@ -42,16 +45,16 @@ Optimization="0" AdditionalIncludeDirectories="..\;..\libgc\include;"..\VSDependancies\include\glib-2.0\glib";..\VSDependancies\include;..\mono\" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__" - MinimalRebuild="TRUE" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" + BufferSecurityCheck="true" UsePrecompiledHeader="0" ObjectFile="$(IntDir)/pedump/" ProgramDataBaseFileName="$(IntDir)/pedump/vc80.pdb" XMLDocumentationFileName="$(IntDir)/pedump/" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="1" DisableSpecificWarnings="4018;4996" @@ -70,7 +73,7 @@ AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib Psapi.lib" LinkIncremental="1" AdditionalLibraryDirectories="..\;..\VSDependancies\lib" - GenerateDebugInformation="TRUE" + GenerateDebugInformation="true" SubSystem="1" TargetMachine="1" /> @@ -126,10 +129,10 @@ Optimization="2" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" - BufferSecurityCheck="TRUE" + BufferSecurityCheck="true" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/embed/test-invoke.vcproj b/samples/embed/test-invoke.vcproj index b24d3ea5d30..f1f489f0587 100644 --- a/samples/embed/test-invoke.vcproj +++ b/samples/embed/test-invoke.vcproj @@ -11,6 +11,9 @@ + @@ -174,6 +177,167 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/embed/test-metadata.vcproj b/samples/embed/test-metadata.vcproj index 3821a3f6b11..fd885f68b9e 100644 --- a/samples/embed/test-metadata.vcproj +++ b/samples/embed/test-metadata.vcproj @@ -6,12 +6,14 @@ ProjectGUID="{C2EB666E-9146-4B7A-85F6-25F9EA313770}" RootNamespace="testmetadata" Keyword="Win32Proj" - SignManifests="true" > + @@ -175,6 +177,167 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/embed/teste.vcproj b/samples/embed/teste.vcproj index 5cf26298e65..9068ff7765f 100644 --- a/samples/embed/teste.vcproj +++ b/samples/embed/teste.vcproj @@ -11,6 +11,9 @@ + @@ -174,6 +177,167 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.25.1