From ae50598816ad7be06dc3f8e809728acd56a1bc99 Mon Sep 17 00:00:00 2001
From: Abs62 <ottomann@yandex.ru>
Date: Wed, 2 Oct 2013 19:57:28 +0400
Subject: [PATCH] Win-specific: Adjust NSIS installation script for GoldenDict
 version 1.5

---
 nsis/GoldenDict.nsi                           | 28 +++++++++++--------
 nsis/gen_uninstall/gen_uninstall.exe.manifest |  9 ++++++
 nsis/gen_uninstall/gen_uninstall.pro          |  2 ++
 nsis/gen_uninstall/gen_uninstall.rc           |  3 ++
 4 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 nsis/gen_uninstall/gen_uninstall.exe.manifest
 create mode 100644 nsis/gen_uninstall/gen_uninstall.rc

diff --git a/nsis/GoldenDict.nsi b/nsis/GoldenDict.nsi
index 6c00d41e..7a98d1ae 100644
--- a/nsis/GoldenDict.nsi
+++ b/nsis/GoldenDict.nsi
@@ -1,7 +1,7 @@
 !include "MUI2.nsh"
 
   Name "GoldenDict"
-  OutFile "GoldenDict-1.0.1-1-Install.exe"
+  OutFile "GoldenDict-1.0.5-Install.exe"
 
   InstallDir "$PROGRAMFILES\GoldenDict"
 
@@ -20,7 +20,7 @@ Var StartMenuFolder
 ;Pages
 
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
+  !insertmacro MUI_PAGE_LICENSE "../LICENSE.txt"
   !insertmacro MUI_PAGE_DIRECTORY
 
   !insertmacro MUI_PAGE_STARTMENU GDApplication $StartMenuFolder
@@ -102,30 +102,35 @@ Section
 
   CreateDirectory $INSTDIR\imageformats
   SetOutPath $INSTDIR\imageformats
-  File ..\release\imageformats\*
+  File ..\imageformats\*
 
-  CreateDirectory $INSTDIR\phonon_backend
-  SetOutPath $INSTDIR\phonon_backend
-  File ..\release\phonon_backend\*
+  CreateDirectory $INSTDIR\codecs
+  SetOutPath $INSTDIR\codecs
+  File ..\codecs\*
+
+  CreateDirectory $INSTDIR\x64
+  SetOutPath $INSTDIR\x64
+  File ..\x64\*
 
   CreateDirectory $INSTDIR\locale
   SetOutPath $INSTDIR\locale
-  File ..\release\locale\*
+  File ..\locale\*
 
   CreateDirectory $INSTDIR\content
   CreateDirectory $INSTDIR\content\morphology
   SetOutPath $INSTDIR\content\morphology
-  File ..\release\content\morphology\*
+  File ..\content\morphology\*
 
   SetOutPath $INSTDIR
-  File ..\release\*.dll
-  File LICENSE.txt
-  File /oname=$INSTDIR\GoldenDict.exe ..\release\goldendict.exe
+  File ..\*.dll
+  File ..\LICENSE.txt
+  File /oname=$INSTDIR\GoldenDict.exe ..\goldendict.exe
   
   WriteUninstaller "$INSTDIR\Uninstall.exe"
 
   !insertmacro MUI_STARTMENU_WRITE_BEGIN GDApplication
       
+  SetShellVarContext all
   CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GoldenDict.lnk" "$INSTDIR\GoldenDict.exe"
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
@@ -404,6 +409,7 @@ Section "Uninstall"
 
   skip_cfg:
 
+  SetShellVarContext all
   !insertmacro MUI_STARTMENU_GETFOLDER GDApplication $StartMenuFolder
 
 ; This file is auto-generated
diff --git a/nsis/gen_uninstall/gen_uninstall.exe.manifest b/nsis/gen_uninstall/gen_uninstall.exe.manifest
new file mode 100644
index 00000000..c1cb4831
--- /dev/null
+++ b/nsis/gen_uninstall/gen_uninstall.exe.manifest
@@ -0,0 +1,9 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
\ No newline at end of file
diff --git a/nsis/gen_uninstall/gen_uninstall.pro b/nsis/gen_uninstall/gen_uninstall.pro
index fce778bf..ad7cf96c 100644
--- a/nsis/gen_uninstall/gen_uninstall.pro
+++ b/nsis/gen_uninstall/gen_uninstall.pro
@@ -9,3 +9,5 @@ INCLUDEPATH += .
 
 # Input
 SOURCES += gen_uninstall.cc
+
+RC_FILE = gen_uninstall.rc
diff --git a/nsis/gen_uninstall/gen_uninstall.rc b/nsis/gen_uninstall/gen_uninstall.rc
new file mode 100644
index 00000000..85f8f6b1
--- /dev/null
+++ b/nsis/gen_uninstall/gen_uninstall.rc
@@ -0,0 +1,3 @@
+#include <windows.h>
+
+1 RT_MANIFEST gen_uninstall.exe.manifest