WinGui: Improvements to the installer. Fixed the issue where the uninstaller could...

diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index 50b134631e8097ed7027e9b4152cb1e29e2d18c9..59923bb8742868cd70b357e49ade29bba8058c16 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -33,6 +33,8 @@ SetCompressor lzma
 !define MUI_LICENSEPAGE_BUTTON $(^NextBtn)\r
 !define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue."\r
 \r
+!define MUI_WELCOMEFINISHPAGE_BITMAP "InstallerBackground.bmp"\r
+\r
 ; Welcome page\r
 !insertmacro MUI_PAGE_WELCOME\r
 ; License page\r
@@ -107,10 +109,11 @@ Function .onInit
 \r
  ;Run the uninstaller\r
   uninst:\r
+   CopyFiles /SILENT /FILESONLY "$INSTDIR\uninst.exe" "$TEMP\uninstallhb.exe"\r
    IfSilent +3\r
-   ExecWait $INSTDIR\uninst.exe\r
+   ExecWait '"$TEMP\uninstallhb.exe" _?=$INSTDIR'\r
    goto done\r
-   ExecWait '"$INSTDIR\uninst.exe" /S'\r
+   ExecWait '"$TEMP\uninstallhb.exe" _?=$INSTDIR /S'\r
   done:\r
 FunctionEnd\r
 \r

diff --git a/win/CS/HandBrakeWPF/Installer/InstallerBackground.bmp b/win/CS/HandBrakeWPF/Installer/InstallerBackground.bmp
new file mode 100644 (file)
index 0000000..7499d02
Binary files /dev/null and b/win/CS/HandBrakeWPF/Installer/InstallerBackground.bmp differ

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index b67757a95043aba09cbd52c91eaf241aaed267d5..ecd6d5b7fe5a62df2b74a9d1660c1e095a7c752e 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -33,6 +33,8 @@ SetCompressor lzma
 !define MUI_LICENSEPAGE_BUTTON $(^NextBtn)\r
 !define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue."\r
 \r
+!define MUI_WELCOMEFINISHPAGE_BITMAP "InstallerBackground.bmp"\r
+\r
 ; Welcome page\r
 !insertmacro MUI_PAGE_WELCOME\r
 ; License page\r
@@ -106,10 +108,11 @@ Function .onInit
 \r
  ;Run the uninstaller\r
   uninst:\r
+   CopyFiles /SILENT /FILESONLY "$INSTDIR\uninst.exe" "$TEMP\uninstallhb.exe"\r
    IfSilent +3\r
-   ExecWait $INSTDIR\uninst.exe\r
+   ExecWait '"$TEMP\uninstallhb.exe" _?=$INSTDIR'\r
    goto done\r
-   ExecWait '"$INSTDIR\uninst.exe" /S'\r
+   ExecWait '"$TEMP\uninstallhb.exe" _?=$INSTDIR /S'\r
   done:\r
 FunctionEnd\r
 \r

diff --git a/win/CS/build.xml b/win/CS/build.xml
index 92f199c292e8f38421d978806226e15ca74900cb..716d17c2d51f1285df0fbbd6bd112a6f716b98bb 100644 (file)
--- a/win/CS/build.xml
+++ b/win/CS/build.xml
@@ -59,6 +59,7 @@
   <!-- Post Build Events -->\r
   <Target Name="NightlyPostBuild">\r
     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />\r
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(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
@@ -67,6 +68,7 @@
 \r
   <Target Name="ReleasePostBuild">\r
     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />\r
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(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