http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44086
User: gerald
Date: 2012/07/27 04:30 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r43965 | gerald | 2012-07-24 09:30:03 -0700 (Tue, 24 Jul 2012) | 3 lines
Changed paths:
M /trunk/packaging/nsis/Makefile.nmake
Remove uninstall_installer.exe when we're done with it so that we don't
have an extraneous executable in the staging directory.
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r43976 | gerald | 2012-07-24 16:59:42 -0700 (Tue, 24 Jul 2012) | 5 lines
Changed paths:
M /trunk/Makefile.nmake
M /trunk/packaging/nsis/Makefile.nmake
Fix the dependencies for wireshark.exe and tshark.exe and use "xcopy
/d" instead of "copy" in Makefile.nmake. Fix the uninstall.exe path in
packaging\nsis\Makefile.nmake. This keeps us from clobbering existing
files in wireshark-gt2 unnecessarily.
------------------------------------------------------------------------
Directory: /trunk-1.8/packaging/nsis/
Changes Path Action
+5 -4 Makefile.nmake Modified
Directory: /trunk-1.8/
Changes Path Action
+3 -3 Makefile.nmake Modified