From 88cc694ec68c7f396945897f7a865bef0ec3b341 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sun, 17 Jul 2011 14:17:53 +0000 Subject: WinGui: Setup a simple msbuild configuration and simplified the project build targets. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4117 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../HandBrake.ApplicationServices.csproj | 14 ++--- .../HandBrakeInterop/HandBrakeInterop.csproj | 8 +-- win/CS/HandBrake10.sln | 63 ++-------------------- win/CS/HandBrakeCS.csproj | 58 ++------------------ win/CS/build.xml | 55 +++++++++++++++++-- 5 files changed, 64 insertions(+), 134 deletions(-) (limited to 'win/CS') diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj index acef58fbd..55fa4a380 100644 --- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj +++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj @@ -21,28 +21,24 @@ x86 bin\x86\Debug\ + DEBUG;TRACE x86 bin\x86\Release\ - - - x86 - bin\x86\NightlyBuild\ true - TRACE + DEBUG;TRACE x64 bin\x64\Debug\ + TRACE;DEBUG x64 bin\x64\Release\ - - - x64 - bin\x64\NightlyBuild\ + TRACE + true diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj index f67900985..e1bb916c5 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj @@ -85,7 +85,7 @@ bin\x86\Release\ - TRACE + DEBUG;TRACE true pdbonly x86 @@ -100,12 +100,6 @@ false false - - bin\x86\NightlyBuild\ - x86 - true - TRACE - 3.0 diff --git a/win/CS/HandBrake10.sln b/win/CS/HandBrake10.sln index 03bc9fdc2..93a1287c3 100644 --- a/win/CS/HandBrake10.sln +++ b/win/CS/HandBrake10.sln @@ -20,14 +20,6 @@ Global Debug|Mixed Platforms = Debug|Mixed Platforms Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Install|Any CPU = Install|Any CPU - Install|Mixed Platforms = Install|Mixed Platforms - Install|x64 = Install|x64 - Install|x86 = Install|x86 - NightlyBuild|Any CPU = NightlyBuild|Any CPU - NightlyBuild|Mixed Platforms = NightlyBuild|Mixed Platforms - NightlyBuild|x64 = NightlyBuild|x64 - NightlyBuild|x86 = NightlyBuild|x86 Release|Any CPU = Release|Any CPU Release|Mixed Platforms = Release|Mixed Platforms Release|x64 = Release|x64 @@ -41,45 +33,20 @@ Global {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x64.ActiveCfg = Debug|x86 {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.ActiveCfg = Debug|x86 {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.Build.0 = Debug|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|Any CPU.ActiveCfg = Install|x64 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|Mixed Platforms.ActiveCfg = Install|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|Mixed Platforms.Build.0 = Install|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|x64.ActiveCfg = Install|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|x86.ActiveCfg = Install|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|x86.Build.0 = Install|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|Any CPU.ActiveCfg = NightlyBuild|x64 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|Mixed Platforms.ActiveCfg = NightlyBuild|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|Mixed Platforms.Build.0 = NightlyBuild|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|x64.ActiveCfg = NightlyBuild|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|x86.ActiveCfg = NightlyBuild|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|x86.Build.0 = NightlyBuild|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.ActiveCfg = Release|x64 + {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.ActiveCfg = Release|x86 {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Mixed Platforms.ActiveCfg = Release|x86 {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Mixed Platforms.Build.0 = Release|x86 {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x64.ActiveCfg = Release|x86 {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.ActiveCfg = Release|x86 {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.Build.0 = Release|x86 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.ActiveCfg = Debug|x64 + {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.ActiveCfg = Debug|x86 {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Mixed Platforms.Build.0 = Debug|x86 {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x64.ActiveCfg = Debug|x64 {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x64.Build.0 = Debug|x64 {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.ActiveCfg = Debug|x86 {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.Build.0 = Debug|x86 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|Any CPU.ActiveCfg = NightlyBuild|x64 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|Mixed Platforms.ActiveCfg = NightlyBuild|x86 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|Mixed Platforms.Build.0 = NightlyBuild|x86 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|x64.ActiveCfg = NightlyBuild|x64 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|x64.Build.0 = NightlyBuild|x64 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|x86.ActiveCfg = Release|x64 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|Any CPU.ActiveCfg = NightlyBuild|x64 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|Mixed Platforms.ActiveCfg = NightlyBuild|x86 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|Mixed Platforms.Build.0 = NightlyBuild|x86 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|x64.ActiveCfg = NightlyBuild|x64 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|x64.Build.0 = NightlyBuild|x64 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|x86.ActiveCfg = NightlyBuild|x86 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|x86.Build.0 = NightlyBuild|x86 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Any CPU.ActiveCfg = Release|x64 + {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Any CPU.ActiveCfg = Release|x86 {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Mixed Platforms.ActiveCfg = Release|x86 {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Mixed Platforms.Build.0 = Release|x86 {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|x64.ActiveCfg = Release|x64 @@ -92,18 +59,6 @@ Global {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.ActiveCfg = Debug|x86 {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x86.ActiveCfg = Debug|x86 {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x86.Build.0 = Debug|x86 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Install|Any CPU.ActiveCfg = Release|x86 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Install|Mixed Platforms.ActiveCfg = Release|x86 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Install|Mixed Platforms.Build.0 = Release|x86 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Install|x64.ActiveCfg = Release|x86 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Install|x86.ActiveCfg = Release|x86 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Install|x86.Build.0 = Release|x86 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.NightlyBuild|Any CPU.ActiveCfg = Release|x86 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.NightlyBuild|Mixed Platforms.ActiveCfg = Release|x86 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.NightlyBuild|Mixed Platforms.Build.0 = Release|x86 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.NightlyBuild|x64.ActiveCfg = Release|x86 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.NightlyBuild|x86.ActiveCfg = Release|x86 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.NightlyBuild|x86.Build.0 = Release|x86 {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|Any CPU.ActiveCfg = Release|x86 {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|Mixed Platforms.ActiveCfg = Release|x86 {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|Mixed Platforms.Build.0 = Release|x86 @@ -117,18 +72,6 @@ Global {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x64.Build.0 = Debug|x64 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x86.ActiveCfg = Debug|x86 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x86.Build.0 = Debug|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Install|Any CPU.ActiveCfg = Release|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Install|Mixed Platforms.ActiveCfg = Release|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Install|Mixed Platforms.Build.0 = Release|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Install|x64.ActiveCfg = Release|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Install|x86.ActiveCfg = Release|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Install|x86.Build.0 = Release|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|Any CPU.ActiveCfg = Release|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|Mixed Platforms.ActiveCfg = NightlyBuild|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|Mixed Platforms.Build.0 = NightlyBuild|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|x64.ActiveCfg = Release|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|x86.ActiveCfg = NightlyBuild|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|x86.Build.0 = NightlyBuild|x86 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Any CPU.ActiveCfg = Release|x86 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Mixed Platforms.ActiveCfg = Release|x86 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Mixed Platforms.Build.0 = Release|x86 diff --git a/win/CS/HandBrakeCS.csproj b/win/CS/HandBrakeCS.csproj index b697eb1b2..ed1d29c25 100644 --- a/win/CS/HandBrakeCS.csproj +++ b/win/CS/HandBrakeCS.csproj @@ -42,61 +42,26 @@ x86 bin\x86\Debug\ AllRules.ruleset + DEBUG;TRACE x86 bin\x86\Release\ false - TRACE;DEBUG + DEBUG;TRACE true AllRules.ruleset - - bin\x86\Build\ - x86 - AllRules.ruleset - - - bin\x86\Install\ - TRACE;DEBUG - true - x86 - bin\x86\Release\Handbrake.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - false - AllRules.ruleset - ;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - false - ;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - false - - - bin\x86\NightlyBuild\ - TRACE - true - x86 - x64 bin\x64\Debug\ + DEBUG;TRACE x64 bin\x64\Release\ - - - x64 - bin\x64\Build\ - - - x64 - bin\x64\Install\ - - - x64 - bin\x64\NightlyBuild\ + true + TRACE @@ -451,19 +416,6 @@ --> - - - makensis Installer.nsi - - - - - copy "$(ProjectDir)Installer\MakeNightly.nsi" "$(ProjectDir)bin\x86\NightlyBuild" /Y - copy "$(ProjectDir)handbrakepineapple.ico" "$(ProjectDir)bin\x86\NightlyBuild" /Y - xcopy "$(ProjectDir)doc" "$(ProjectDir)bin\x86\NightlyBuild\doc" /I /Y - makensis "$(ProjectDir)bin\x86\NightlyBuild\MakeNightly.nsi" - - subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs" diff --git a/win/CS/build.xml b/win/CS/build.xml index 55d3852b4..d0c40cacb 100644 --- a/win/CS/build.xml +++ b/win/CS/build.xml @@ -1,6 +1,51 @@ - - - + + + + + + Deploy\ + Release + + + + + + + + - - + + + Nightly;NightlyPostBuildEvent + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3