From 45760f6e6982a1e4a56ba26a77a2adfe0a9327dd Mon Sep 17 00:00:00 2001 From: sr55 <sr55.hb@outlook.com> Date: Sun, 25 Mar 2012 19:07:39 +0000 Subject: [PATCH] WinGui: Fix build scripts. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4543 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../HandBrake.ApplicationServices.csproj | 1 - win/CS/build.xml | 8 ++++++-- win/CS/build2.xml | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj index 406fdabd8..62c5dc916 100644 --- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj +++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj @@ -132,7 +132,6 @@ <Compile Include="Parsing\Parser.cs" /> <Compile Include="Parsing\Subtitle.cs" /> <Compile Include="Parsing\Title.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> diff --git a/win/CS/build.xml b/win/CS/build.xml index 4fa72c4c1..872b9f202 100644 --- a/win/CS/build.xml +++ b/win/CS/build.xml @@ -24,11 +24,11 @@ <!-- Dependencies --> <PropertyGroup> - <NightlyDependsOn>BuildRelease;NightlyPostBuildEvent</NightlyDependsOn> + <NightlyDependsOn>PreBuild;BuildRelease;NightlyPostBuildEvent</NightlyDependsOn> </PropertyGroup> <PropertyGroup> - <InstallDependsOn>BuildRelease;CreateReleasePostBuildEvent</InstallDependsOn> + <InstallDependsOn>PreBuild;BuildRelease;CreateReleasePostBuildEvent</InstallDependsOn> </PropertyGroup> @@ -47,6 +47,10 @@ </Target> <!-- Pre Build Events --> + <Target Name="PreBuild"> + <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" /> + </Target> + <!-- Post Build Events --> <Target Name="NightlyPostBuildEvent"> <Exec Command="copy $(ProjectDir)Installer\MakeNightly.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x86'" /> diff --git a/win/CS/build2.xml b/win/CS/build2.xml index 17e2f498a..76a3f015a 100644 --- a/win/CS/build2.xml +++ b/win/CS/build2.xml @@ -52,6 +52,7 @@ <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs" /> <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi" /> <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi" /> + <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" /> </Target> <!-- Post Build Events --> -- 2.40.0