1 files changed, 34 insertions, 31 deletions
diff --git a/win/CS/build.xml b/win/CS/build.xml
index 872b9f202..549044838 100644
--- a/win/CS/build.xml
+++ b/win/CS/build.xml
@@ -5,38 +5,40 @@
   It may be used under the terms of the GNU General Public License
   
   HandBrake Build Scipt for usage with Jenkins.
-  Usage: msbuild build.xml /p:Platform=x86 /t:ReleaseInstaller
+  Usage: 
+    msbuild build.xml /p:Platform=x86 /t:Nightly
+    msbuild build.xml /p:Platform=x86 /t:Release
   Reuqires: HandBrakeCli.exe to be in the release folder.
+  
 -->
 <Project DefaultTargets="NightlyBuild" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
+
   <!-- Setup -->
   <PropertyGroup>
     <Configuration>Release</Configuration>
   </PropertyGroup>
-  
+
   <!-- Build all the main cproj files.-->
   <ItemGroup>
     <ProjectsToBuild Include="HandBrake.Interop\HandBrakeInterop\*proj" Exclude="$(MSBuildProjectFile)"/>
     <ProjectsToBuild Include="HandBrake.ApplicationServices\*proj" Exclude="$(MSBuildProjectFile)"/>
-    <ProjectsToBuild Include="HandBrakeCS.*proj" Exclude="$(MSBuildProjectFile)"/>
+    <ProjectsToBuild Include="HandBrakeWPF\HandBrakeWPF.*proj" Exclude="$(MSBuildProjectFile)"/>
+    <ProjectsToBuild Include="HandBrakeWPF\HandBrakeCS.*proj" Exclude="$(MSBuildProjectFile)"/>
   </ItemGroup>
 
   <!-- Dependencies -->
   <PropertyGroup>
-    <NightlyDependsOn>PreBuild;BuildRelease;NightlyPostBuildEvent</NightlyDependsOn>
+    <NightlyDependsOn>PreBuild;BuildRelease;NightlyPostBuild</NightlyDependsOn>
   </PropertyGroup>
 
   <PropertyGroup>
-    <InstallDependsOn>PreBuild;BuildRelease;CreateReleasePostBuildEvent</InstallDependsOn>
+    <InstallDependsOn>PreBuild;BuildRelease;ReleasePostBuild</InstallDependsOn>
   </PropertyGroup>
 
-  
   <!-- Builds /t: -->
-  <Target Name="NightlyBuild" DependsOnTargets="$(NightlyDependsOn)"/>
-  <Target Name="ReleaseInstaller" DependsOnTargets="$(InstallDependsOn)"/>
-  <Target Name="AlphaRelease" DependsOnTargets="$(AlphaDependsOn)"/>
-  
+  <Target Name="Nightly" DependsOnTargets="$(NightlyDependsOn)"/>
+  <Target Name="Release" DependsOnTargets="$(InstallDependsOn)"/>
+
   <!-- Build All Components (Forms, WPF, ApplicationServices, Interop -->
   <Target Name="BuildRelease">
     <MSBuild Projects ="@(ProjectsToBuild)"
@@ -45,33 +47,34 @@
       <Output ItemName="OutputFiles" TaskParameter="TargetOutputs"/>
     </MSBuild>
   </Target>
-  
+
   <!-- Pre Build Events -->
   <Target Name="PreBuild">
+    <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)HandBrakeWPF\Installer\Installer.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\Installer.nsi" />
+    <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Installer\Installer64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\Installer64.nsi" />
     <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'" />
-    <Exec Command="copy $(ProjectDir)Installer\MakeNightly64.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x64'" />
-    
-    <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)bin\$(Platform)\Release /Y" />
-    <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)bin\$(Platform)\Release\doc /I /Y" />
-    
-    <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
-    <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
+  <Target Name="NightlyPostBuild">
+    <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x86'" />
+    <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x64'" />
+    <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\Release /Y" />
+    <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\Release\doc /I /Y" />
+    <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
+    <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
   </Target>
 
-  <Target Name="CreateReleasePostBuildEvent">
-    <Exec Command="copy $(ProjectDir)Installer\Installer.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x86'" />
-    <Exec Command="copy $(ProjectDir)Installer\Installer64.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x64'" />
-
-    <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)bin\$(Platform)\Release /Y" />
-    <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)bin\$(Platform)\Release\doc /I /Y" />
-
-    <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\Installer.nsi" Condition="$(Platform) == 'x86'" />
-    <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />
+  <Target Name="ReleasePostBuild">
+    <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\Installer.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x86'" />
+    <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\Installer64.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x64'" />
+    <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\Release /Y" />
+    <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\Release\doc /I /Y" />
+    <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\Installer.nsi" Condition="$(Platform) == 'x86'" />
+    <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />
   </Target>
 
 </Project>
 \ No newline at end of file