From 861f8a5dec3d73b9c72279b226b39dce0e1b5dff Mon Sep 17 00:00:00 2001
From: Scott <sr55@users.noreply.github.com>
Date: Thu, 27 Aug 2015 14:05:42 +0100
Subject: [PATCH] WinGui: Build fixes for git.

---
 win/CS/HandBrakeWPF/HandBrakeWPF.csproj       |  4 +-
 .../{MakeNightly.nsi.tmpl => MakeNightly.nsi} |  0
 ...keNightly64.nsi.tmpl => MakeNightly64.nsi} |  0
 win/CS/build.xml                              | 50 +++++++++----------
 4 files changed, 27 insertions(+), 27 deletions(-)
 rename win/CS/HandBrakeWPF/Installer/{MakeNightly.nsi.tmpl => MakeNightly.nsi} (100%)
 rename win/CS/HandBrakeWPF/Installer/{MakeNightly64.nsi.tmpl => MakeNightly64.nsi} (100%)

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 351b6da15..b0a55aacf 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -386,8 +386,8 @@
     <None Include="app.config" />
     <None Include="Installer\Installer.nsi" />
     <None Include="Installer\Installer64.nsi" />
-    <None Include="Installer\MakeNightly.nsi.tmpl" />
-    <None Include="Installer\MakeNightly64.nsi.tmpl" />
+    <None Include="Installer\MakeNightly.nsi" />
+    <None Include="Installer\MakeNightly64.nsi" />
     <None Include="Properties\AssemblyInfo.cs.Nightly.tmpl" />
     <None Include="Properties\AssemblyInfo.cs.tmpl" />
     <AppDesigner Include="Properties\" />
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
similarity index 100%
rename from win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl
rename to win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
similarity index 100%
rename from win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl
rename to win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
diff --git a/win/CS/build.xml b/win/CS/build.xml
index f6e511dfa..383fff2c2 100644
--- a/win/CS/build.xml
+++ b/win/CS/build.xml
@@ -46,42 +46,42 @@
     </MSBuild>
   </Target>
 
-  <!-- Pre Build Events. You must do a full checkout as it takes the svn from the main directory.  $(ProjectDir). is not used. -->
+  <!-- Pre Build Events. You must do a full checkout as it takes the svn from the main directory.  $(MSBuildProjectDirectory). is not used. -->
     <Target Name="NightlyPreBuild">
-    <!--<Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs.Nightly.tmpl $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs" />
-    <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
-    <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
-    <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.Nightly.tmpl $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />-->
+    <!--<Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)HandBrakeWPF\Properties\AssemblyInfo.cs.Nightly.tmpl $(MSBuildProjectDirectory)HandBrakeWPF\Properties\AssemblyInfo.cs" />
+    <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(MSBuildProjectDirectory)HandBrakeWPF\Installer\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
+    <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(MSBuildProjectDirectory)HandBrakeWPF\Installer\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
+    <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.Nightly.tmpl $(MSBuildProjectDirectory)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />-->
     </Target>
 
     <Target Name="PreBuild">
-      <!-- <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs" />
-      <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
-      <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
-      <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />-->
+      <!-- <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)HandBrakeWPF\Properties\AssemblyInfo.cs.tmpl $(MSBuildProjectDirectory)HandBrakeWPF\Properties\AssemblyInfo.cs" />
+      <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(MSBuildProjectDirectory)HandBrakeWPF\Installer\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
+      <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(MSBuildProjectDirectory)HandBrakeWPF\Installer\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
+      <Exec Command="subwcrev.exe ../../ $(MSBuildProjectDirectory)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.tmpl $(MSBuildProjectDirectory)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />-->
     </Target>
 
   <!-- Post Build Events -->
   <Target Name="NightlyPostBuild">
-    <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi $(ProjectDir)HandBrakeWPF\bin\x86\Release /Y" Condition="$(Platform) == 'x86'" />
-    <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi $(ProjectDir)HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />
-    <Exec Command="copy $(ProjectDir)HandBrakeWPF\handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\x86\Release /Y" Condition="$(Platform) == 'x86'" />
-    <Exec Command="copy $(ProjectDir)HandBrakeWPF\handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />
-    <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\x86\Release\doc /I /Y" Condition="$(Platform) == 'x86'" />
-    <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />
-    <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\x86\Release\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
-    <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
+    <Exec Command="copy $(MSBuildProjectDirectory)HandBrakeWPF\Installer\MakeNightly.nsi $(MSBuildProjectDirectory)HandBrakeWPF\bin\x86\Release /Y" Condition="$(Platform) == 'x86'" />
+    <Exec Command="copy $(MSBuildProjectDirectory)HandBrakeWPF\Installer\MakeNightly64.nsi $(MSBuildProjectDirectory)HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />
+    <Exec Command="copy $(MSBuildProjectDirectory)HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)HandBrakeWPF\bin\x86\Release /Y" Condition="$(Platform) == 'x86'" />
+    <Exec Command="copy $(MSBuildProjectDirectory)HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />
+    <Exec Command="xcopy $(MSBuildProjectDirectory)doc $(MSBuildProjectDirectory)HandBrakeWPF\bin\x86\Release\doc /I /Y" Condition="$(Platform) == 'x86'" />
+    <Exec Command="xcopy $(MSBuildProjectDirectory)doc $(MSBuildProjectDirectory)HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />
+    <Exec Command="makensis $(MSBuildProjectDirectory)HandBrakeWPF\bin\x86\Release\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
+    <Exec Command="makensis $(MSBuildProjectDirectory)HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
   </Target>
 
   <Target Name="ReleasePostBuild">
-    <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\Installer.nsi $(ProjectDir)HandBrakeWPF\bin\x86\Release /Y" Condition="$(Platform) == 'x86'" />
-    <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\Installer64.nsi $(ProjectDir)HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />
-    <Exec Command="copy $(ProjectDir)HandBrakeWPF\handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\x86\Release /Y" Condition="$(Platform) == 'x86'" />
-    <Exec Command="copy $(ProjectDir)HandBrakeWPF\handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />
-    <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\x86\Release\doc /I /Y" Condition="$(Platform) == 'x86'" />
-    <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />
-    <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\x86\Release\Installer.nsi" Condition="$(Platform) == 'x86'" />
-    <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\x64\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />
+    <Exec Command="copy $(MSBuildProjectDirectory)HandBrakeWPF\Installer\Installer.nsi $(MSBuildProjectDirectory)HandBrakeWPF\bin\x86\Release /Y" Condition="$(Platform) == 'x86'" />
+    <Exec Command="copy $(MSBuildProjectDirectory)HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />
+    <Exec Command="copy $(MSBuildProjectDirectory)HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)HandBrakeWPF\bin\x86\Release /Y" Condition="$(Platform) == 'x86'" />
+    <Exec Command="copy $(MSBuildProjectDirectory)HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />
+    <Exec Command="xcopy $(MSBuildProjectDirectory)doc $(MSBuildProjectDirectory)HandBrakeWPF\bin\x86\Release\doc /I /Y" Condition="$(Platform) == 'x86'" />
+    <Exec Command="xcopy $(MSBuildProjectDirectory)doc $(MSBuildProjectDirectory)HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />
+    <Exec Command="makensis $(MSBuildProjectDirectory)HandBrakeWPF\bin\x86\Release\Installer.nsi" Condition="$(Platform) == 'x86'" />
+    <Exec Command="makensis $(MSBuildProjectDirectory)HandBrakeWPF\bin\x64\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />
   </Target>
 
 </Project>
\ No newline at end of file
-- 
2.40.0