From e69f31534fd5eae8c9a7b880036416e2744b57d4 Mon Sep 17 00:00:00 2001 From: ankit Date: Wed, 25 Nov 2009 19:15:15 +0000 Subject: [PATCH] In class/Microsoft.Build.Tasks/Microsoft.Build.Tasks: * ManagedCompiler.cs (AddResponseFileCommands): *mcs doesn't support /debug:pdbonly, so map it to /debug:full . In tools/xbuild/tests: * standalone/Project1/final-outputs.txt: Update. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@146934 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- .../Microsoft.Build.Tasks/ChangeLog | 5 +++++ .../Microsoft.Build.Tasks/ManagedCompiler.cs | 7 ++++++- tools/xbuild/tests/ChangeLog | 4 ++++ .../tests/standalone/Project01/final-outputs.txt | 18 ++++++++++++------ 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog b/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog index 2aa9087cf6..f7f2e5d90f 100644 --- a/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog +++ b/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog @@ -1,3 +1,8 @@ +2009-11-26 Ankit Jain + + * ManagedCompiler.cs (AddResponseFileCommands): *mcs doesn't + support /debug:pdbonly, so map it to /debug:full . + 2009-11-10 Ankit Jain * ToolTask.cs (ToolExe): New. diff --git a/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs b/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs index e625d92df1..08cd77068e 100644 --- a/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs +++ b/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs @@ -59,7 +59,12 @@ namespace Microsoft.Build.Tasks { if (Bag ["CodePage"] != null) commandLine.AppendSwitchIfNotNull ("/codepage:", CodePage.ToString ()); - commandLine.AppendSwitchIfNotNull ("/debug:", DebugType); + if (!String.IsNullOrEmpty (DebugType) && + String.Compare (DebugType, "pdbonly", true) == 0) + // *mcs doesn't support "pdbonly", map it to "full" + commandLine.AppendSwitch ("/debug:full"); + else + commandLine.AppendSwitchIfNotNull ("/debug:", DebugType); if (Bag ["DelaySign"] != null) if (DelaySign) diff --git a/tools/xbuild/tests/ChangeLog b/tools/xbuild/tests/ChangeLog index 40d6f28af1..dc342c6435 100644 --- a/tools/xbuild/tests/ChangeLog +++ b/tools/xbuild/tests/ChangeLog @@ -1,3 +1,7 @@ +2009-11-26 Ankit Jain + + * standalone/Project1/final-outputs.txt: Update. + 2009-10-08 Ankit Jain * standalone/Project1: Add a new Lib5 project, and add diff --git a/tools/xbuild/tests/standalone/Project01/final-outputs.txt b/tools/xbuild/tests/standalone/Project01/final-outputs.txt index d2045e0b72..d0d7ac881d 100644 --- a/tools/xbuild/tests/standalone/Project01/final-outputs.txt +++ b/tools/xbuild/tests/standalone/Project01/final-outputs.txt @@ -6,13 +6,14 @@ ./Lib1/bin/Release/Lib1.deploy.txt ./Lib1/bin/Release/Lib1.dll ./Lib1/bin/Release/Lib1.dll.config +./Lib1/bin/Release/Lib1.dll.mdb ./Lib1/bin/Release/Lib2.dll ./Lib1/bin/Release/Lib2.dll.mdb ./Lib1/bin/Release/lib2_folder/Lib2.deploy.txt ./Lib1/bin/Release/Lib3.dll +./Lib1/bin/Release/Lib3.dll.mdb ./Lib1/bin/Release/Lib4.dll ./Lib1/bin/Release/Lib4.dll.mdb -./Lib1/obj/Lib1.csproj.FilesWrittenAbsolute.txt ./Lib1/obj/Release/en-US/Lib1.resources.dll ./Lib1/obj/Release/fr-CA/Lib1.resources.dll ./Lib1/obj/Release/fr-FR/Lib1.resources.dll @@ -20,7 +21,9 @@ ./Lib1/obj/Release/Lib1.Book.fr-CA.resources ./Lib1/obj/Release/Lib1.Book.resources ./Lib1/obj/Release/Lib1.Choco.foo.resources +./Lib1/obj/Release/Lib1.csproj.FilesWrittenAbsolute.txt ./Lib1/obj/Release/Lib1.dll +./Lib1/obj/Release/Lib1.dll.mdb ./Lib1/obj/Release/Lib1.InvalidCulture.foo.txt ./Lib1/obj/Release/Lib1.Lib1.foo.txt ./Lib1/obj/Release/Lib1.Publisher.fr-CA.resources @@ -38,6 +41,7 @@ ./Lib2/obj/Debug/Lib2.Book.fr-CA.resources ./Lib2/obj/Debug/Lib2.Book.resources ./Lib2/obj/Debug/Lib2.Choco.foo.resources +./Lib2/obj/Debug/Lib2.csproj.FilesWrittenAbsolute.txt ./Lib2/obj/Debug/Lib2.dll ./Lib2/obj/Debug/Lib2.dll.mdb ./Lib2/obj/Debug/Lib2.InvalidCulture.bar.txt @@ -45,15 +49,16 @@ ./Lib2/obj/Debug/Lib2.Publisher.fr-CA.resources ./Lib2/obj/Debug/Lib2.Publisher.fr-FR.resources ./Lib2/obj/Debug/Lib2.Publisher.resources -./Lib2/obj/Lib2.csproj.FilesWrittenAbsolute.txt ./Lib3/bin/Release/Lib3.dll -./Lib3/obj/Lib3.csproj.FilesWrittenAbsolute.txt +./Lib3/bin/Release/Lib3.dll.mdb +./Lib3/obj/Release/Lib3.csproj.FilesWrittenAbsolute.txt ./Lib3/obj/Release/Lib3.dll +./Lib3/obj/Release/Lib3.dll.mdb ./Lib4/bin/Debug/Lib4.dll ./Lib4/bin/Debug/Lib4.dll.mdb +./Lib4/obj/Debug/Lib4.csproj.FilesWrittenAbsolute.txt ./Lib4/obj/Debug/Lib4.dll ./Lib4/obj/Debug/Lib4.dll.mdb -./Lib4/obj/Lib4.csproj.FilesWrittenAbsolute.txt ./Lib5/bin/Debug/en-US/Lib5.resources.dll ./Lib5/bin/Debug/fr-CA/Lib5.resources.dll ./Lib5/bin/Debug/fr-FR/Lib5.resources.dll @@ -68,6 +73,7 @@ ./Lib5/obj/Debug/Lib5.Book.fr-CA.resources ./Lib5/obj/Debug/Lib5.Book.resources ./Lib5/obj/Debug/Lib5.Choco.foo.resources +./Lib5/obj/Debug/Lib5.csproj.FilesWrittenAbsolute.txt ./Lib5/obj/Debug/Lib5.dll ./Lib5/obj/Debug/Lib5.dll.mdb ./Lib5/obj/Debug/Lib5.InvalidCulture.foo.txt @@ -75,7 +81,6 @@ ./Lib5/obj/Debug/Lib5.Publisher.fr-CA.resources ./Lib5/obj/Debug/Lib5.Publisher.fr-FR.resources ./Lib5/obj/Debug/Lib5.Publisher.resources -./Lib5/obj/Lib5.csproj.FilesWrittenAbsolute.txt ./Project01/bin/Debug/abc.dll ./Project01/bin/Debug/bar.dll ./Project01/bin/Debug/en-US/Lib1.resources.dll @@ -86,6 +91,7 @@ ./Project01/bin/Debug/fr-FR/Lib2.resources.dll ./Project01/bin/Debug/Lib1.deploy.txt ./Project01/bin/Debug/Lib1.dll +./Project01/bin/Debug/Lib1.dll.mdb ./Project01/bin/Debug/Lib2.dll ./Project01/bin/Debug/Lib2.dll.mdb ./Project01/bin/Debug/lib2_folder/Lib2.deploy.txt @@ -93,6 +99,6 @@ ./Project01/bin/Debug/Lib4.dll.mdb ./Project01/bin/Debug/Project01.exe ./Project01/bin/Debug/Project01.exe.mdb +./Project01/obj/Debug/Main.csproj.FilesWrittenAbsolute.txt ./Project01/obj/Debug/Project01.exe ./Project01/obj/Debug/Project01.exe.mdb -./Project01/obj/Main.csproj.FilesWrittenAbsolute.txt -- 2.11.4.GIT