http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=43238
User: gerald
Date: 2012/06/13 01:12 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r43236 | gerald | 2012-06-13 12:06:27 -0700 (Wed, 13 Jun 2012) | 17 lines
Changed paths:
M /trunk/packaging/nsis/AdditionalTasksPage.ini
M /trunk/packaging/nsis/Makefile.nmake
A /trunk/packaging/nsis/common.nsh
A /trunk/packaging/nsis/uninstall.nsi
M /trunk/packaging/nsis/wireshark.nsi
Move the "uninstall" parts of wireshark.nsi to uninstall.nsi and the
common parts to common.nsh. Creating an installer now requires two
NSIS runs:
- uninstaller.nsi, which creates an installer (uninstall_installer.exe)
that only writes uninstall.exe to ../../wireshark-gtk2.
- wireshark.nsi, which bundles uninstall.exe along with the rest of
our installation files.
If we ever get around to signing our executables this will let us sign
all of them. It also cleans up the .nsi file contents a bit.
Instead of keeping separate list of file extensions, manage them from
a single macro. Print the extensions we register / deregister in the
detail pane.
------------------------------------------------------------------------
r43237 | gerald | 2012-06-13 13:11:41 -0700 (Wed, 13 Jun 2012) | 3 lines
Changed paths:
M /trunk/packaging/nsis/uninstall.nsi
M /trunk/packaging/nsis/wireshark.nsi
Use terminology that conforms better with the MSDN documentation and a
style that conforms better with the rest of the NSIS output.
------------------------------------------------------------------------
Directory: /trunk-1.8/packaging/nsis/
Changes Path Action
+1 -1 AdditionalTasksPage.ini Modified
+20 -5 Makefile.nmake Modified
+100 -0 common.nsh Added
+266 -0 uninstall.nsi Added
+26 -376 wireshark.nsi Modified