WinGui: Fix build system / installer issues around language support.

5 files changed, 23 insertions, 16 deletions

diff --git a/win/CS/HandBrake.sln b/win/CS/HandBrake.sln
index 204bb96a2..5bea23de6 100644
--- a/win/CS/HandBrake.sln
+++ b/win/CS/HandBrake.sln
@@ -33,15 +33,11 @@ Global
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.ActiveCfg = Release|x64

 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.Build.0 = Release|x64

 		{3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x64.ActiveCfg = Debug|Any CPU

-		{3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x64.Build.0 = Debug|Any CPU

 		{3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.ActiveCfg = Release|Any CPU

-		{3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.Build.0 = Release|Any CPU

 		{6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Debug|x64.ActiveCfg = Debug|x64

 		{6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x64.ActiveCfg = Release|x64

 		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|x64.ActiveCfg = Debug|x64

-		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|x64.Build.0 = Debug|x64

 		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Release|x64.ActiveCfg = Release|x64

-		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index a8120971d..3836cae4e 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -734,10 +734,6 @@
       <Project>{087a2ba8-bac2-4577-a46f-07ff9d420016}</Project>

       <Name>HandBrake.Interop</Name>

     </ProjectReference>

-    <ProjectReference Include="..\HandBrake.Worker\HandBrake.Worker.csproj">

-      <Project>{f8370f37-b226-4830-aee7-6d7ae403e3d2}</Project>

-      <Name>HandBrake.Worker</Name>

-    </ProjectReference>

   </ItemGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index 4a5f05a84..1bc6ec2ff 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -150,6 +150,11 @@ Section "HandBrake" SEC01
   File "*.config"

   File "*.pdb"

 

+ ; Copy the languages

+  SetOutPath "$INSTDIR\de"

+  SetOverwrite ifnewer

+  File "de\*.*"

+

   ; Copy the standard doc set into the doc folder

   SetOutPath "$INSTDIR\doc"

   SetOverwrite ifnewer

@@ -192,6 +197,9 @@ Section Uninstall
   Delete "$INSTDIR\*.*"

   Delete "$INSTDIR\doc\*.*"

   RMDir  "$INSTDIR\doc"

+  Delete "$INSTDIR\de\*.*"

+  RMDir  "$INSTDIR\de"

+

   Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk"

   Delete "$DESKTOP\HandBrake.lnk"

   Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk"

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index 696f00c42..f40b71fec 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -149,6 +149,11 @@ Section "HandBrake" SEC01
   File "*.config"

   File "HandBrake*.pdb"

 

+  ; Copy the languages

+  SetOutPath "$INSTDIR\de"

+  SetOverwrite ifnewer

+  File "de\*.*"

+

   ; Copy the standard doc set into the doc folder

   SetOutPath "$INSTDIR\doc"

   SetOverwrite ifnewer

@@ -188,6 +193,8 @@ Section Uninstall
   Delete "$INSTDIR\*.*"

   Delete "$INSTDIR\doc\*.*"

   RMDir  "$INSTDIR\doc"

+  Delete "$INSTDIR\de\*.*"

+  RMDir  "$INSTDIR\de"

   RMDir  "$INSTDIR"

    

   Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk"

diff --git a/win/CS/build.xml b/win/CS/build.xml
index f45034778..92f199c29 100644
--- a/win/CS/build.xml
+++ b/win/CS/build.xml
@@ -58,18 +58,18 @@
 

   <!-- Post Build Events -->

   <Target Name="NightlyPostBuild">

-    <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\x64\Release /Y" Condition="$(Platform) == 'x64'" />

-    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />

-    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />

+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />

+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />

+    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />

+    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" />

     <Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />

   </Target>

 

   <Target Name="ReleasePostBuild">

-    <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\x64\Release /Y" Condition="$(Platform) == 'x64'" />

-    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />

-    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />

+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />

+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />

+    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />

+    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\Installer64.nsi" />

     <Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />

   </Target>