diff options
29 files changed, 77 insertions, 31 deletions
@@ -2,6 +2,7 @@ VERSION=2.1.0 profile=default tests=no +release=no prefix=NONE test -e "$CONFIG_SITE" && . "$CONFIG_SITE" test "$prefix" = NONE && prefix=/usr/local @@ -10,7 +11,7 @@ usage () { profiles=`ls profiles | sed -e "s/$/,/g" | fmt | sed -e 's/,$//' -e "s/ChangeLog, //"` echo "" - echo "Usage : configure [--prefix=PREFIX] [--select] [--profile=PROFILE]" + echo "Usage : configure [--prefix=PREFIX] [--select] [--profile=PROFILE] [--release-builds]" echo "" echo "This script allows selecting and configuring a set of MonoDevelop" echo "modules to be included in an integrated build." @@ -49,6 +50,9 @@ usage () echo "--enable-tests" echo " Build the md test suite" echo "" + echo "--enable-release" + echo " Builds md in release mode" + echo "" echo "--profile=PROFILE" echo "" echo " Configure the build system using the provided profile." @@ -167,6 +171,9 @@ configure_packages () prefixarg="" fi done + if test xyes == x$release; then + ops="$ops --enable-release" + fi title="Configuring package: $path" nc=`echo $title | wc -m` @@ -225,6 +232,9 @@ while test x$1 != x; do --enable-tests) tests=yes ;; + --enable-release) + release=yes + ;; --prefix=*) prefix=`echo $1 | sed 's/--prefix=//'` ;; diff --git a/main/Main.sln b/main/Main.sln index 5f2c15d4a4..96361d2eb0 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -805,8 +805,8 @@ Global {63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86 + {63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseWin32|Any CPU.Build.0 = Release|x86 {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugGnome|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
@@ -1163,6 +1163,7 @@ Global {9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{9A415695-CF80-4845-AA80-0DA26CF1E256}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9A415695-CF80-4845-AA80-0DA26CF1E256}.Release|Any CPU.Build.0 = Release|Any CPU {9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
@@ -1608,8 +1609,8 @@ Global {DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Release|Any CPU.Build.0 = Release|Any CPU
{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86
{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseGnome|Any CPU.Build.0 = Release|x86
- {DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseMac|Any CPU.ActiveCfg = Release|x86
- {DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseMac|Any CPU.Build.0 = Release|x86
+ {DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU + {DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86
{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseWin32|Any CPU.Build.0 = Release|x86
{DB96F55E-41C5-4330-A427-15A4EC028BBE}.Debug|Any CPU.ActiveCfg = Debug|x86
diff --git a/main/configure.in b/main/configure.in index 5f99604a45..05cfae5a1e 100644 --- a/main/configure.in +++ b/main/configure.in @@ -178,6 +178,13 @@ AC_ARG_ENABLE(git, AM_CONDITIONAL(ENABLE_GIT, test x$enable_git = xyes) +AC_ARG_ENABLE(release, + AC_HELP_STRING([--enable-release], + [build release mode [default=no]]), + enable_release=${enableval}, enable_release=no) + +AM_CONDITIONAL(RELEASE_BUILDS, [test x$enable_release = xyes]) + platform_bindings="" # Gnome platform addin @@ -374,4 +381,5 @@ echo " * Subversion (Unix): $enable_subversion" echo " * Git: $enable_git" echo " * Platform bindings: $platform_bindings" echo " * Unit tests: $enable_tests" +echo " * Release builds: $enable_release" echo "" diff --git a/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj b/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj index bd02ec8375..68961b4f98 100644 --- a/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj +++ b/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj @@ -14,7 +14,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> <DebugType>full</DebugType> - <Optimize>True</Optimize> + <Optimize>false</Optimize> <OutputPath>..\..\..\..\build\AddIns\BackendBindings\</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/main/src/addins/CSharpBinding/Autotools/Autotools.csproj b/main/src/addins/CSharpBinding/Autotools/Autotools.csproj index 5bb5d88633..f6784fc266 100644 --- a/main/src/addins/CSharpBinding/Autotools/Autotools.csproj +++ b/main/src/addins/CSharpBinding/Autotools/Autotools.csproj @@ -37,8 +37,8 @@ <Execution clr-version="Net_2_0" /> </Execution> <DebugSymbols>true</DebugSymbols> - <DefineConstants>1591</DefineConstants> <DocumentationFile>..\..\..\..\build\AddIns\BackendBindings\MonoDevelop.CSharpBinding.Autotools.xml</DocumentationFile> + <NoWarn>1591;1573</NoWarn> </PropertyGroup> <ItemGroup> <ProjectReference Include="..\..\MonoDevelop.Autotools\MonoDevelop.Autotools.csproj"> diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj index 511567e76c..6950d93dc2 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj @@ -24,6 +24,7 @@ <DefineConstants>DEBUG</DefineConstants> <NoWarn>1591;1573</NoWarn> <DocumentationFile>..\..\..\..\build\AddIns\MonoDevelop.Deployment\MonoDevelop.Deployment.xml</DocumentationFile> + <DebugType>full</DebugType> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.NonUserCodeTestLib/MonoDevelop.Debugger.Tests.NonUserCodeTestLib.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.NonUserCodeTestLib/MonoDevelop.Debugger.Tests.NonUserCodeTestLib.csproj index 5de4c16d4a..a6ad6eb5a0 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.NonUserCodeTestLib/MonoDevelop.Debugger.Tests.NonUserCodeTestLib.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.NonUserCodeTestLib/MonoDevelop.Debugger.Tests.NonUserCodeTestLib.csproj @@ -22,12 +22,13 @@ <ConsolePause>false</ConsolePause> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>full</DebugType> + <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> <OutputPath>bin\Release</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <ConsolePause>false</ConsolePause> + <DebugSymbols>true</DebugSymbols> </PropertyGroup> <ItemGroup> <Reference Include="System" /> diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj b/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj index 3f8982f8ca..43a845d8f2 100644 --- a/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj +++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj @@ -27,7 +27,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>bin\Release</OutputPath> + <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.GtkCore</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <Execution> @@ -35,7 +35,7 @@ </Execution> <DebugSymbols>true</DebugSymbols> <NoWarn>1591;1573</NoWarn> - <DocumentationFile>bin\Release\libstetic.xml</DocumentationFile> + <DocumentationFile>..\..\..\..\build\AddIns\MonoDevelop.GtkCore\libstetic.xml</DocumentationFile> </PropertyGroup> <ItemGroup> <Reference Include="Mono.Posix" /> diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj b/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj index fb9b52a59d..07386f8269 100644 --- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj +++ b/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj @@ -29,7 +29,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>bin\Release</OutputPath> + <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.GtkCore</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <Execution> @@ -38,7 +38,7 @@ <AllowUnsafeBlocks>True</AllowUnsafeBlocks> <DebugSymbols>true</DebugSymbols> <NoWarn>1591;1573</NoWarn> - <DocumentationFile>bin\Release\libsteticui.xml</DocumentationFile> + <DocumentationFile>..\..\..\..\build\AddIns\MonoDevelop.GtkCore\libsteticui.xml</DocumentationFile> </PropertyGroup> <ItemGroup> <Reference Include="Mono.Posix" /> diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj index ababaa5f14..d943261f88 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj @@ -42,6 +42,7 @@ <OutputPath>..\..\..\..\build\tests</OutputPath> <DebugSymbols>true</DebugSymbols> <DebugType>pdbonly</DebugType> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> </PropertyGroup> <ItemGroup> <Reference Include="System" /> diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj index f20cbb242f..d17918d108 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj @@ -46,6 +46,7 @@ <OutputPath>..\..\..\build\AddIns\MonoDevelop.PackageManagement</OutputPath> <DebugSymbols>true</DebugSymbols> <DebugType>pdbonly</DebugType> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> </PropertyGroup> <ItemGroup> <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj index 783dd1265d..b6e3a4e61c 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj @@ -42,6 +42,7 @@ <NoWarn>1591;1573</NoWarn> <DebugSymbols>true</DebugSymbols> <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Refactoring\MonoDevelop.Refactoring.xml</DocumentationFile> + <DebugType>full</DebugType> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' "> <Optimize>true</Optimize> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj index c31f0d394f..7a398fdb7d 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj @@ -45,7 +45,7 @@ </Execution> <DebugSymbols>true</DebugSymbols> <NoWarn>1591;1573</NoWarn> - <DocumentationFile>..\..\..\build\AddIns\DisplayBindings\SourceEditor\MonoDevelop.SourceEditor.xml</DocumentationFile> + <DocumentationFile>..\..\..\build\AddIns\DisplayBindings\SourceEditor\MonoDevelop.SourceEditor2.xml</DocumentationFile> </PropertyGroup> <ItemGroup> <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> diff --git a/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj b/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj index 0303e2ded5..2074526569 100644 --- a/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj +++ b/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj @@ -9,6 +9,7 @@ <OutputType>Library</OutputType> <RootNamespace>NUnit</RootNamespace> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <AssemblyName>MonoDeveloperExtensions_nunit</AssemblyName> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -21,7 +22,6 @@ <Execution> <Execution clr-version="Net_2_0" /> </Execution> - <AssemblyName>MonoDeveloperExtensions_nunit</AssemblyName> <DefineConstants>DEBUG</DefineConstants> <NoWarn>1591;1573</NoWarn> <DocumentationFile>..\..\..\..\build\AddIns\MonoDeveloperExtensions\MonoDeveloperExtensions_nunit.xml</DocumentationFile> @@ -36,10 +36,9 @@ <Execution> <Execution clr-version="Net_2_0" /> </Execution> - <AssemblyName>NUnit</AssemblyName> <DebugSymbols>true</DebugSymbols> <NoWarn>1591;1573</NoWarn> - <DocumentationFile>..\..\..\..\build\AddIns\MonoDeveloperExtensions\NUnit.xml</DocumentationFile> + <DocumentationFile>..\..\..\..\build\AddIns\MonoDeveloperExtensions\MonoDeveloperExtensions_nunit.xml</DocumentationFile> </PropertyGroup> <ItemGroup> <ProjectReference Include="..\MonoDeveloperExtensions.csproj"> diff --git a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj index 7ec1567eb5..7ce6f9d114 100644 --- a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj +++ b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj @@ -30,7 +30,7 @@ <Optimize>True</Optimize> <OutputPath>..\..\..\build\AddIns\NUnit\</OutputPath> <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> + <WarningLevel>3</WarningLevel> <Execution> <Execution clr-version="Net_2_0" /> </Execution> diff --git a/main/src/addins/TextTemplating/TextTransform/TextTransform.csproj b/main/src/addins/TextTemplating/TextTransform/TextTransform.csproj index 69822959b6..5cc987754f 100644 --- a/main/src/addins/TextTemplating/TextTransform/TextTransform.csproj +++ b/main/src/addins/TextTemplating/TextTransform/TextTransform.csproj @@ -32,6 +32,7 @@ <DebugSymbols>true</DebugSymbols> <NoWarn>1591;1573</NoWarn> <DocumentationFile>..\..\..\..\build\AddIns\MonoDevelop.TextTemplating\TextTransform.xml</DocumentationFile> + <Commandlineparameters>-o:out.txt in.tt</Commandlineparameters> </PropertyGroup> <ItemGroup> <Reference Include="System" /> diff --git a/main/src/addins/VBNetBinding/VBNetBinding.csproj b/main/src/addins/VBNetBinding/VBNetBinding.csproj index f574a41ae1..c9a9280711 100644 --- a/main/src/addins/VBNetBinding/VBNetBinding.csproj +++ b/main/src/addins/VBNetBinding/VBNetBinding.csproj @@ -30,7 +30,7 @@ <Optimize>True</Optimize> <OutputPath>..\..\..\build\AddIns\BackendBindings\</OutputPath> <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> + <WarningLevel>3</WarningLevel> <Execution> <Execution clr-version="Net_2_0" /> </Execution> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj index a31284a05a..2d2b01fe3b 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj @@ -74,6 +74,7 @@ <WarningLevel>4</WarningLevel> <NoWarn>1591;1573</NoWarn> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <ConsolePause>false</ConsolePause> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -83,6 +84,7 @@ <WarningLevel>4</WarningLevel> <NoWarn>1591;1573</NoWarn> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <ConsolePause>false</ConsolePause> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -92,6 +94,7 @@ <WarningLevel>4</WarningLevel> <NoWarn>1591;1573</NoWarn> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <ConsolePause>false</ConsolePause> </PropertyGroup> <ItemGroup> <Reference Include="System" /> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj index 12e0013822..7b5fee7c62 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj @@ -80,10 +80,11 @@ <OutputPath>..\..\..\..\build\AddIns\VersionControl</OutputPath> <WarningLevel>4</WarningLevel> <DebugSymbols>true</DebugSymbols> - <NoWarn>1591;1573</NoWarn> + <NoWarn>1591</NoWarn> <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\MonoDevelop.VersionControl.Git.xml</DocumentationFile> <DebugType>pdbonly</DebugType> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <ConsolePause>false</ConsolePause> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' "> <Optimize>true</Optimize> @@ -94,6 +95,7 @@ <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\MonoDevelop.VersionControl.Git.xml</DocumentationFile> <DebugType>pdbonly</DebugType> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <ConsolePause>false</ConsolePause> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' "> <Optimize>true</Optimize> @@ -104,6 +106,7 @@ <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\MonoDevelop.VersionControl.Git.xml</DocumentationFile> <DebugType>pdbonly</DebugType> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <ConsolePause>false</ConsolePause> </PropertyGroup> <ItemGroup> <Reference Include="System" /> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj index b787abf01d..39a4ab53a3 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj @@ -57,6 +57,8 @@ <DebugSymbols>true</DebugSymbols> <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\MonoDevelop.VersionControl.Subversion.Unix.xml</DocumentationFile> <DebugType>pdbonly</DebugType> + <ConsolePause>false</ConsolePause> + <NoWarn>1591;1573</NoWarn> </PropertyGroup> <ItemGroup> <Reference Include="System" /> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj index 5ffb4039fe..191e7cc630 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj @@ -29,9 +29,9 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>True</Optimize> - <OutputPath>..\..\..\..\build\AddIns\VersionControl\</OutputPath> + <OutputPath>..\..\..\..\build\AddIns\VersionControl</OutputPath> <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> + <WarningLevel>3</WarningLevel> <AllowUnsafeBlocks>True</AllowUnsafeBlocks> <Execution> <Execution clr-version="Net_2_0" /> diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj index 2a4612a1f0..0f19949e44 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj @@ -32,7 +32,7 @@ <AllowUnsafeBlocks>True</AllowUnsafeBlocks> <DebugSymbols>true</DebugSymbols> <NoWarn>1591;1573</NoWarn> - <DocumentationFile>..\..\..\build\AddIns\WindowsPlatform.xml</DocumentationFile> + <DocumentationFile>..\..\..\..\build\AddIns\WindowsPlatform\WindowsPlatform.xml</DocumentationFile> </PropertyGroup> <ItemGroup> <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> diff --git a/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj b/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj index d949155e6b..f0e25198ed 100644 --- a/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj +++ b/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj @@ -39,6 +39,7 @@ </Execution> <DebugSymbols>true</DebugSymbols> <NoWarn>1591;1573</NoWarn> + <DefineConstants>TRACE</DefineConstants> </PropertyGroup> <ItemGroup> <ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj index 7bf6d66b54..15cbf277ed 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj @@ -31,14 +31,14 @@ <Optimize>True</Optimize> <OutputPath>..\..\..\build\bin</OutputPath> <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> + <WarningLevel>3</WarningLevel> <Execution> <Execution clr-version="Net_2_0" /> </Execution> <AllowUnsafeBlocks>True</AllowUnsafeBlocks> <DebugSymbols>true</DebugSymbols> <NoWarn>1591;1573</NoWarn> - <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Ide.xml</DocumentationFile> + <DocumentationFile>..\..\..\build\bin\MonoDevelop.Ide.xml</DocumentationFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -62,8 +62,8 @@ <OutputPath>..\..\..\build\bin</OutputPath> <DefineConstants>MAC</DefineConstants> <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Ide.xml</DocumentationFile> + <WarningLevel>3</WarningLevel> + <DocumentationFile>..\..\..\build\bin\MonoDevelop.Ide.xml</DocumentationFile> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Execution> <Execution clr-version="Net_2_0" /> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.csproj index f5a8db28bc..900f4d1219 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.csproj @@ -28,7 +28,6 @@ <WarningLevel>4</WarningLevel> <DebugSymbols>true</DebugSymbols> <NoWarn>1591;1573</NoWarn> - <DocumentationFile>..\..\..\build\bin\MonoDevelop.Projects.Formats.MSBuild.xml</DocumentationFile> <DefineConstants>NET_3_5,NET_4_0</DefineConstants> </PropertyGroup> <ItemGroup> diff --git a/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj b/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj index 1b05ea1b5b..9a0c8ca36e 100644 --- a/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj +++ b/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj @@ -37,15 +37,13 @@ <Optimize>true</Optimize> <OutputPath>..\..\..\build\bin</OutputPath> <WarningLevel>4</WarningLevel> - <PlatformTarget>x86</PlatformTarget> <DebugSymbols>true</DebugSymbols> - <NoWarn>1591;1573</NoWarn> - <DocumentationFile>..\..\..\build\bin\MonoDevelop.xml</DocumentationFile> + <Commandlineparameters>-no-redirect</Commandlineparameters> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> <DebugType>full</DebugType> - <Optimize>True</Optimize> + <Optimize>false</Optimize> <OutputPath>..\..\..\build\bin</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -69,6 +67,8 @@ <Execution> <Execution clr-version="Net_2_0" /> </Execution> + <DebugSymbols>true</DebugSymbols> + <Commandlineparameters>-no-redirect</Commandlineparameters> </PropertyGroup> <PropertyGroup> <ApplicationManifest>app.manifest</ApplicationManifest> diff --git a/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj b/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj index 551a07ce92..e37d85f71e 100644 --- a/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj +++ b/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj @@ -21,6 +21,7 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <ConsolePause>false</ConsolePause> + <DebugType>full</DebugType> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <Optimize>true</Optimize> diff --git a/main/tests/TestRunner/TestRunner.csproj b/main/tests/TestRunner/TestRunner.csproj index ffe14d325c..5c1b7d9058 100644 --- a/main/tests/TestRunner/TestRunner.csproj +++ b/main/tests/TestRunner/TestRunner.csproj @@ -19,6 +19,7 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <ConsolePause>false</ConsolePause> + <DebugType>full</DebugType> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <Optimize>true</Optimize> diff --git a/main/xbuild.include b/main/xbuild.include index 46cc92b49f..493d09a0de 100644 --- a/main/xbuild.include +++ b/main/xbuild.include @@ -2,16 +2,28 @@ ALL_CSPROJ=$(wildcard *.csproj) MAIN_SLN=$(top_builddir)/Main.sln if ENABLE_MACPLATFORM +if RELEASE_BUILDS +PROFILE_NAME=ReleaseMac +else PROFILE_NAME=DebugMac endif +endif if ENABLE_GNOMEPLATFORM +if RELEASE_BUILDS +PROFILE_NAME=ReleaseGnome +else PROFILE_NAME=DebugGnome endif +endif if ENABLE_WINDOWSPLATFORM +if RELEASE_BUILDS +PROFILE_NAME=ReleaseWin32 +else PROFILE_NAME=DebugWin32 endif +endif XBUILD=xbuild XBUILD_VERBOSITY=normal |