My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions

Issue 928 attachment: 0001-Win7-Vista-admin-rights-support.patch (10.3 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
From 5588395a38a1d61915d0bea384dac7175166164a Mon Sep 17 00:00:00 2001
From: KousukeItsagame <bleukousuke@inbox.com>
Date: Mon, 4 Apr 2011 09:45:36 +0200
Subject: [PATCH] Win7/Vista admin rights support,
Added ieshims path,
Using MUI2,
Updated program paths,
small bug fixes

---
windowsinstaller.nsi | 275 +++++++++++++++++++++++++++++---------------------
1 files changed, 162 insertions(+), 113 deletions(-)

diff --git a/windowsinstaller.nsi b/windowsinstaller.nsi
index b6abed9..488005b 100644
--- a/windowsinstaller.nsi
+++ b/windowsinstaller.nsi
@@ -1,113 +1,162 @@
-; Copyright 2008 Jason A. Donenfeld <Jason@zx2c4.com>
-
-SetCompressor /SOLID /FINAL lzma
-
-!define PRODUCT_NAME "Arora"
-!define /date PRODUCT_VERSION "0.11.0"
-;!define /date PRODUCT_VERSION "Snapshot (%#m-%#d-%#Y)"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\arora.exe"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"
-!define QTDIR "C:\Qt\qt-all-opensource-src-4.5.3"
-
-!include "MUI.nsh"
-!define MUI_ABORTWARNING
-!define MUI_ICON ".\src\browser.ico"
-!define MUI_UNICON ".\src\browser.ico"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!define MUI_FINISHPAGE_RUN "$INSTDIR\arora.exe"
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_LANGUAGE "English"
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "${PRODUCT_NAME} ${PRODUCT_VERSION} Installer.exe"
-InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
-ShowInstDetails show
-ShowUnInstDetails show
-
-Section "Main Components"
- KillProcDLL::KillProc "arora.exe"
- Sleep 100
- SetOverwrite on
-
- SetOutPath "$INSTDIR"
- File "arora.exe"
- File "tools\htmlToXbel\release\htmlToXBel.exe"
- File "tools\cacheinfo\release\arora-cacheinfo.exe"
- File "tools\placesimport\release\arora-placesimport.exe"
- File "${QTDIR}\lib\QtCore4.dll"
- File "${QTDIR}\lib\QtGui4.dll"
- File "${QTDIR}\lib\QtNetwork4.dll"
- File "${QTDIR}\lib\QtWebKit4.dll"
- File "${QTDIR}\lib\QtScript4.dll"
- File "${QTDIR}\lib\QtSql4.dll"
- ;File "${QTDIR}\lib\phonon4.dll"
- File "C:\Qt\openssl-0.9.8j\out32dll\ssleay32.dll"
- File "C:\Qt\openssl-0.9.8j\out32dll\libeay32.dll"
-
- SetOutPath "$INSTDIR\locale"
- File "src\.qm\locale\*.qm"
- File "${QTDIR}\translations\qt*.qm"
-
- SetOutPath "$INSTDIR\plugins\sqldrivers"
- File "${QTDIR}\plugins\sqldrivers\qsqlite4.dll"
-
- SetOutPath "$INSTDIR\imageformats"
- File "${QTDIR}\plugins\imageformats\qtiff4.dll"
- File "${QTDIR}\plugins\imageformats\qsvg4.dll"
- File "${QTDIR}\plugins\imageformats\qmng4.dll"
- File "${QTDIR}\plugins\imageformats\qjpeg4.dll"
- File "${QTDIR}\plugins\imageformats\qico4.dll"
- File "${QTDIR}\plugins\imageformats\qgif4.dll"
-
- SetOutPath "$INSTDIR\iconengines"
- File "${QTDIR}\plugins\iconengines\qsvgicon4.dll"
-
- SetOutPath "$INSTDIR\codecs"
- File "${QTDIR}\plugins\codecs\qtwcodecs4.dll"
- File "${QTDIR}\plugins\codecs\qkrcodecs4.dll"
- File "${QTDIR}\plugins\codecs\qjpcodecs4.dll"
- File "${QTDIR}\plugins\codecs\qcncodecs4.dll"
-
- SetOutPath "$INSTDIR\phonon_backend"
-; File "${QTDIR}\plugins\phonon_backend\phonon_ds94.dll"
-SectionEnd
-
-Section Icons
- CreateShortCut "$SMPROGRAMS\Arora.lnk" "$INSTDIR\arora.exe"
-SectionEnd
-
-Section Uninstaller
- WriteUninstaller "$INSTDIR\uninst.exe"
- WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\arora.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\arora.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
-SectionEnd
-
-Section MSVC
- InitPluginsDir
- SetOutPath $PLUGINSDIR
- File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe"
- DetailPrint "Installing Visual C++ 2005 Libraries"
- ExecWait '"$PLUGINSDIR\vcredist_x86.exe" /q:a /c:"msiexec /i vcredist.msi /quiet"'
-SectionEnd
-
-Section Uninstall
- KillProcDLL::KillProc "arora.exe"
- Sleep 100
- Delete $SMPROGRAMS\Arora.lnk
- RMDir /r "$INSTDIR"
- DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
- DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
-SectionEnd
-
-BrandingText "arora-browser.org"
+; Copyright 2008 Jason A. Donenfeld <Jason@zx2c4.com>
+; Edited By Kousuke March 2011
+
+; For fulfilling the dependencies of arora you need ieshims.dll
+; This file changed directory since internet explorer 8
+; The new directory is \program files\internet explorer\
+; In this script I added the directory to the path so this file can be accessed
+; Firefox needs this dll as well
+; When adding things to PATH admin privileges are required sadly
+; I also fixed a bug when removing shortcut
+
+;prerequisites:
+;an already build arora source
+;an already build qt source
+;an already build openssl
+;killproc_dll download http://nsis.sourceforge.net/KillProcDLL_plug-in
+;envarupdate.nsh download http://nsis.sourceforge.net/mediawiki/images/a/ad/EnvVarUpdate.7z
+;the correct msvc redistributable according the compiler you used
+;the redistributable file can be downloaded from microsoft website)
+;check if paths to files are correct
+;renaming installer to the version you use
+
+;changelog:
+;release unofficial windowsinstaller2.nsi
+;add ieshims.dll to path
+;add admin rights for windows vista/7
+;renamed needed programs to latest version
+;using MUI2 for better look installer
+
+SetCompressor /SOLID /FINAL lzma
+
+!define PRODUCT_NAME "Arora"
+!define /date PRODUCT_VERSION "0.11.0"
+;!define /date PRODUCT_VERSION "Snapshot (%#m-%#d-%#Y)"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\arora.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+!define QTDIR "C:\Qt471\"
+
+!include "MUI2.nsh"
+!define MUI_ABORTWARNING
+!define MUI_ICON ".\src\browser.ico"
+!define MUI_UNICON ".\src\browser.ico"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!define MUI_FINISHPAGE_RUN "$INSTDIR\arora.exe"
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "${PRODUCT_NAME} ${PRODUCT_VERSION} Installer.exe"
+InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+;Needed for windows vista and 7
+;http://nsis.sourceforge.net/Shortcuts_removal_fails_on_Windows_Vista
+
+;install files as admin
+RequestExecutionLevel admin
+
+;path manipulation headers
+!include "LogicLib.nsh"
+!include "EnvVarUpdate.nsh"
+
+Section "Add to Path"
+ ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "%PROGRAMFILES%\Internet Explorer"
+SectionEnd
+
+Section "Main Components"
+ KillProcDLL::KillProc "arora.exe"
+ Sleep 100
+ SetOverwrite on
+
+ SetOutPath "$INSTDIR"
+ File "arora.exe"
+ File "tools\htmlToXbel\release\htmlToXBel.exe"
+ File "tools\cacheinfo\release\arora-cacheinfo.exe"
+ File "tools\placesimport\release\arora-placesimport.exe"
+ File "${QTDIR}\lib\QtCore4.dll"
+ File "${QTDIR}\lib\QtGui4.dll"
+ File "${QTDIR}\lib\QtNetwork4.dll"
+ File "${QTDIR}\lib\QtWebKit4.dll"
+ File "${QTDIR}\lib\QtScript4.dll"
+ File "${QTDIR}\lib\QtSql4.dll"
+ ;File "${QTDIR}\lib\phonon4.dll"
+ File "C:\arorasdk\openssl-1.0.0c\out32dll\ssleay32.dll"
+ File "C:\arorasdk\openssl-1.0.0c\out32dll\libeay32.dll"
+
+ SetOutPath "$INSTDIR\locale"
+ File "src\.qm\locale\*.qm"
+ File "${QTDIR}\translations\qt*.qm"
+
+ SetOutPath "$INSTDIR\sqldrivers"
+ File "${QTDIR}\plugins\sqldrivers\qsqlite4.dll"
+
+ SetOutPath "$INSTDIR\imageformats"
+ File "${QTDIR}\plugins\imageformats\qtiff4.dll"
+ File "${QTDIR}\plugins\imageformats\qsvg4.dll"
+ File "${QTDIR}\plugins\imageformats\qmng4.dll"
+ File "${QTDIR}\plugins\imageformats\qjpeg4.dll"
+ File "${QTDIR}\plugins\imageformats\qico4.dll"
+ File "${QTDIR}\plugins\imageformats\qgif4.dll"
+
+ SetOutPath "$INSTDIR\iconengines"
+ File "${QTDIR}\plugins\iconengines\qsvgicon4.dll"
+
+ SetOutPath "$INSTDIR\codecs"
+ File "${QTDIR}\plugins\codecs\qtwcodecs4.dll"
+ File "${QTDIR}\plugins\codecs\qkrcodecs4.dll"
+ File "${QTDIR}\plugins\codecs\qjpcodecs4.dll"
+ File "${QTDIR}\plugins\codecs\qcncodecs4.dll"
+
+ SetOutPath "$INSTDIR\phonon_backend"
+ File "${QTDIR}\plugins\phonon_backend\phonon_ds94.dll"
+SectionEnd
+
+Section Icons
+ ;Needed when using admin rights vista/7
+ SetShellVarContext all
+ CreateShortCut "$SMPROGRAMS\Arora.lnk" "$INSTDIR\arora.exe"
+SectionEnd
+
+Section Uninstaller
+ WriteUninstaller "$INSTDIR\uninst.exe"
+ WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\arora.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\arora.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+SectionEnd
+
+Section MSVC
+ InitPluginsDir
+ SetOutPath $PLUGINSDIR
+
+ File "C:\msvc\vcredist2010\vcredist_x86.exe"
+ DetailPrint "Installing Visual C++ 2010 Libraries"
+ ExecWait '"$PLUGINSDIR\vcredist_x86.exe" /q:a /c:"msiexec /i vcredist.msi /quiet"'
+SectionEnd
+
+Section Uninstall
+ KillProcDLL::KillProc "arora.exe"
+ Sleep 100
+ ;needed when using admin rights vista/7
+ SetShellVarContext all
+ Delete "$SMPROGRAMS\Arora.lnk"
+ ${Un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "%PROGRAMFILES%\Internet Explorer"
+ Delete "$INSTDIR\Uninst.exe"
+ RMDir /r "$INSTDIR"
+ DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+ DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+
+SectionEnd
+
+BrandingText "arora-browser.org"
--
1.7.3.5

Powered by Google Project Hosting