Browse Source

Update UAC nsis plugin to 0.2.4c. Building the installer with nsis 3.0 (final) is possible now. Closes #5556.

adaptive-webui-19844
sledgehammer999 8 years ago
parent
commit
a7253c5ead
  1. 29
      dist/windows/README.txt
  2. 2
      dist/windows/UAC.nsh
  3. BIN
      dist/windows/nsis plugins/UAC Unicode.zip
  4. BIN
      dist/windows/nsis plugins/UAC.zip

29
dist/windows/README.txt vendored

@ -1,12 +1,12 @@
TRANSLATORS: TRANSLATORS:
1. Use an editor that has NSIS syntax highlighting(eg Notepad++/Geany). This will 1. Use an editor that has NSIS syntax highlighting(eg Notepad++/Geany). This will
make your life easier. make your life easier.
2. Open the relevant .nsi file that exists in the folder named 2. Open the relevant .nsi file that exists in the folder named
"installer-translations" "installer-translations"
3. Lines starting with ";" are considered comments. These include the 3. Lines starting with ";" are considered comments. These include the
english message to help you with the translation. english message to help you with the translation.
4. Edit only the part inside the quotation marks(""). Unless you know 4. Edit only the part inside the quotation marks(""). Unless you know
what you are doing. what you are doing.
5. Save the files with utf8 encoding and BOM. 5. Save the files with utf8 encoding and BOM.
6. Submit your changes: 1) as a pull request to the official git repo or 6. Submit your changes: 1) as a pull request to the official git repo or
@ -16,17 +16,13 @@ TRANSLATORS:
PACKAGERS: PACKAGERS:
You will need NSIS and upx to make the installer. You need a unicode version of NSIS. You will need NSIS and upx to make the installer. You need a unicode version of NSIS.
I tested with NSIS 3.0a0. I tested with NSIS 3.0 (final).
1. Open the options.nsi file in an editor and change line that contains 1. Open the options.nsi file in an editor and change line that contains
"!define PROG_VERSION "3.0.3"" to the version of qbittorrent you just built. "!define PROG_VERSION "3.0.3"" to the version of qbittorrent you just built.
2. Extract the plugins found in the folder "nsis plugins" into your 2. Extract the plugins found in the folder "nsis plugins" into your
NSIS's unicode Plugin directory(usually C:\Program Files\NSIS\Plugins\x86-unicode). NSIS's unicode Plugin directory(usually C:\Program Files\NSIS\Plugins\x86-unicode).
Only the *.dll files are needed. Don't use the .dll from UAC.zip, use the one from "UAC Unicode.zip". Only the *.dll files are needed. Use the unicode version of the dlls.
NOTE: To build the unicode version of UAC with MSVC2008 you need:
a) the sources from UAC.zip
b) apply the util.cpp.diff from "UAC Unicode.zip" to util.cpp
c) in a msvc command prompt issue: cl.exe /O1s /GS- /GR- /EHs-c- /Zl /LD /DUNICODE RunAs.cpp uac.cpp util.cpp /link kernel32.lib user32.lib shell32.lib advapi32.lib ole32.lib /DLL /MANIFEST:NO /OUT:uac.dll
3. The script you need to compile is "qbittorrent.nsi". It includes all other necessary scripts. 3. The script you need to compile is "qbittorrent.nsi". It includes all other necessary scripts.
4. The script expects the following file tree: 4. The script expects the following file tree:
@ -53,10 +49,11 @@ qbittorrent.exe
qbittorrent.nsi qbittorrent.nsi
qt.conf qt.conf
translations.nsi translations.nsi
UAC.nsh
uninstaller.nsi uninstaller.nsi
5. "license.txt" is a text file that contains the text rendered 5. "license.txt" is a text file that contains the text rendered
from src\gui\gpl.html or the text contained in COPYING from src\gui\gpl.html or the text contained in COPYING
6. "qbittorrent.exe" is the compiled binary file. 6. "qbittorrent.exe" is the compiled binary file.
@ -64,7 +61,7 @@ SCRIPT HACKERS:
If you add any new LangString variable to the scripts you NEED to provide If you add any new LangString variable to the scripts you NEED to provide
"translations" of it to all the .nsi files inside "installer-translations. "translations" of it to all the .nsi files inside "installer-translations.
You can always leave the english string but you have to use all the LANG_<lang name> You can always leave the english string but you have to use all the LANG_<lang name>
for the given variable. Otherwise, if the user chooses a language that you for the given variable. Otherwise, if the user chooses a language that you
haven't provided a LANG_<lang name> for your variable then your string will be empty. haven't provided a LANG_<lang name> for your variable then your string will be empty.
Don't worry though, NSIS throws warnings for this when compiling the scripts. Don't worry though, NSIS throws warnings for this when compiling the scripts.

2
dist/windows/UAC.nsh vendored

@ -228,6 +228,8 @@ pop $_LOGICLIB_TEMP
!undef _UAC_ParseDefineFlags_orin_this !undef _UAC_ParseDefineFlags_orin_this
!ifdef _UAC_ParseDefineFlags_orin_f1 !ifdef _UAC_ParseDefineFlags_orin_f1
!undef _UAC_ParseDefineFlags_orin_f1 !undef _UAC_ParseDefineFlags_orin_f1
!endif
!ifdef _UAC_ParseDefineFlags_orin_f2
!undef _UAC_ParseDefineFlags_orin_f2 !undef _UAC_ParseDefineFlags_orin_f2
!endif !endif
!macroend !macroend

BIN
dist/windows/nsis plugins/UAC Unicode.zip vendored

Binary file not shown.

BIN
dist/windows/nsis plugins/UAC.zip vendored

Binary file not shown.
Loading…
Cancel
Save