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

diff --git a/win/CS/HandBrake.sln b/win/CS/HandBrake.sln
index 204bb96a257dff37bd5ada4b56967f9b1eb37677..5bea23de6873816a0228056f1645607e5247a630 100644 (file)
--- 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\r
                {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.Build.0 = Release|x64\r
                {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x64.ActiveCfg = Debug|Any CPU\r
-               {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x64.Build.0 = Debug|Any CPU\r
                {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.ActiveCfg = Release|Any CPU\r
-               {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.Build.0 = Release|Any CPU\r
                {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Debug|x64.ActiveCfg = Debug|x64\r
                {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x64.ActiveCfg = Release|x64\r
                {F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|x64.ActiveCfg = Debug|x64\r
-               {F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|x64.Build.0 = Debug|x64\r
                {F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Release|x64.ActiveCfg = Release|x64\r
-               {F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index a8120971dd8a1a97565c6e3f78440254a2912e37..3836cae4e0a8874e29a00fc7443f7bc550dfd402 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -734,10 +734,6 @@
       <Project>{087a2ba8-bac2-4577-a46f-07ff9d420016}</Project>\r
       <Name>HandBrake.Interop</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\HandBrake.Worker\HandBrake.Worker.csproj">\r
-      <Project>{f8370f37-b226-4830-aee7-6d7ae403e3d2}</Project>\r
-      <Name>HandBrake.Worker</Name>\r
-    </ProjectReference>\r
   </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r

diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index 4a5f05a8469173accf903c8265c0f71eb412e010..1bc6ec2ff13922148b51fe66c1323ed014262ebe 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -150,6 +150,11 @@ Section "HandBrake" SEC01
   File "*.config"\r
   File "*.pdb"\r
 \r
+ ; Copy the languages\r
+  SetOutPath "$INSTDIR\de"\r
+  SetOverwrite ifnewer\r
+  File "de\*.*"\r
+\r
   ; Copy the standard doc set into the doc folder\r
   SetOutPath "$INSTDIR\doc"\r
   SetOverwrite ifnewer\r
@@ -192,6 +197,9 @@ Section Uninstall
   Delete "$INSTDIR\*.*"\r
   Delete "$INSTDIR\doc\*.*"\r
   RMDir  "$INSTDIR\doc"\r
+  Delete "$INSTDIR\de\*.*"\r
+  RMDir  "$INSTDIR\de"\r
+\r
   Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk"\r
   Delete "$DESKTOP\HandBrake.lnk"\r
   Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk"\r

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index 696f00c4229961acd8a58013fc127c8f0c34f567..f40b71fecc4d338791e4641f2a13d5aacba5bc9f 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -149,6 +149,11 @@ Section "HandBrake" SEC01
   File "*.config"\r
   File "HandBrake*.pdb"\r
 \r
+  ; Copy the languages\r
+  SetOutPath "$INSTDIR\de"\r
+  SetOverwrite ifnewer\r
+  File "de\*.*"\r
+\r
   ; Copy the standard doc set into the doc folder\r
   SetOutPath "$INSTDIR\doc"\r
   SetOverwrite ifnewer\r
@@ -188,6 +193,8 @@ Section Uninstall
   Delete "$INSTDIR\*.*"\r
   Delete "$INSTDIR\doc\*.*"\r
   RMDir  "$INSTDIR\doc"\r
+  Delete "$INSTDIR\de\*.*"\r
+  RMDir  "$INSTDIR\de"\r
   RMDir  "$INSTDIR"\r
    \r
   Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk"\r

diff --git a/win/CS/build.xml b/win/CS/build.xml
index f45034778ab2dbf3bd91c3e4b1c6442c10e6301a..92f199c292e8f38421d978806226e15ca74900cb 100644 (file)
--- a/win/CS/build.xml
+++ b/win/CS/build.xml
@@ -58,18 +58,18 @@
 \r
   <!-- Post Build Events -->\r
   <Target Name="NightlyPostBuild">\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />\r
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />\r
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />\r
+    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />\r
+    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" />\r
     <Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />\r
   </Target>\r
 \r
   <Target Name="ReleasePostBuild">\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />\r
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />\r
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />\r
+    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />\r
+    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\Installer64.nsi" />\r
     <Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />\r
   </Target>\r
 \r