http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=20617
User: gerald
Date: 2007/01/30 01:02 AM
Log:
Copy over revisions 20491 - 20497 from the trunk:
------------------------------------------------------------------------
r20491 | ulfl | 2007-01-18 15:57:03 -0800 (Thu, 18 Jan 2007) | 4 lines
Changed paths:
M /trunk/docbook/Makefile
the docbook generation also suffers from the cygwin bash CR/LF problem :-(
I've added a call to dos2unix to convert check_svn_version.sh that way
Is it safe to assume that dos2unix is available on a common UNIX developer machine?!?
patching file packaging/nsis/wireshark.nsi
------------------------------------------------------------------------
r20492 | ulfl | 2007-01-18 16:10:22 -0800 (Thu, 18 Jan 2007) | 1 line
Changed paths:
M /trunk/packaging/nsis/Makefile.nmake
M /trunk/packaging/nsis/wireshark.nsi
instead of getting the user-guide.chm file always from the docbook dir, copy the more recent one from docbook or win32-libs\user-guide dir into local nsis dir, and use that one to build the installer - seems to be the cleanest way
------------------------------------------------------------------------
r20493 | ulfl | 2007-01-18 16:12:01 -0800 (Thu, 18 Jan 2007) | 1 line
Changed paths:
M /trunk/docbook/Makefile
add a target to build a zipped version of user-guide.chm
------------------------------------------------------------------------
r20494 | ulfl | 2007-01-18 16:14:43 -0800 (Thu, 18 Jan 2007) | 1 line
Changed paths:
M /trunk/docbook/Makefile
add user-guide.zip to the clean target
------------------------------------------------------------------------
r20495 | ulfl | 2007-01-18 17:10:59 -0800 (Thu, 18 Jan 2007) | 1 line
Changed paths:
M /trunk/Makefile.nmake
M /trunk/tools/win32-setup.sh
add the user-guide as a component to the setup target
------------------------------------------------------------------------
r20496 | ulfl | 2007-01-18 17:21:17 -0800 (Thu, 18 Jan 2007) | 2 lines
Changed paths:
M /trunk/config.nmake
user-guide final step:
enable HHC_DIR as default, hopefully the buildbot will "get it right" now :-)
------------------------------------------------------------------------
r20497 | ulfl | 2007-01-18 18:41:25 -0800 (Thu, 18 Jan 2007) | 4 lines
Changed paths:
M /trunk/Makefile.nmake
As discussed on the devlist:
A clean_setup is done first now to ensure that the target dirs don't contain old files - probably remaining from a previous setup run.
explicit removing of the gtk2 dir is no longer required therefore
Directory: /trunk-0.99.5/docbook/
Changes Path Action
+7 -1 Makefile Modified
Directory: /trunk-0.99.5/packaging/nsis/
Changes Path Action
+7 -1 Makefile.nmake Modified
+1 -1 wireshark.nsi Modified
Directory: /trunk-0.99.5/tools/
Changes Path Action
+1 -1 win32-setup.sh Modified
Directory: /trunk-0.99.5/
Changes Path Action
+8 -4 Makefile.nmake Modified
+99 -70 NEWS Modified
+2 -2 config.nmake Modified