From Motonori Shindo: don't put the PDB files into the release, as

they're not built and the executables already contain debugging
information, and update the README.win32 file appropriately and add
Text2Pcap and Mergecap to it.

svn path=/trunk/; revision=4425

5 files changed, 20 insertions, 32 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index 8bec8b9ed2..1c43d83919 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.155 2001/12/16 22:30:09 guy Exp $
+# $Id: Makefile.nmake,v 1.156 2001/12/19 19:16:10 guy Exp $
 
 include config.nmake
 include <win32.mak>
@@ -330,10 +330,6 @@ dftest_LIBS= epan\ethereal.lib \
 
 EXECUTABLES=ethereal.exe tethereal.exe editcap.exe mergecap.exe text2pcap.exe
 
-EXECUTABLES_PDBS = $(EXECUTABLES:.exe=.pdb)
-
-PDBS = $(EXECUTABLES_PDBS) $(PDB_FILE) 
-
 RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res image\mergecap.res image\text2pcap.res
 
 all: tools wiretap gtk epan image $(EXECUTABLES) $(RESOURCES)
@@ -406,7 +402,7 @@ text2pcap-scanner.c : text2pcap-scanner.l
 	$(LEX) -otext2pcap-scanner.c text2pcap-scanner.l
 
 clean:
-	rm -f $(ethereal_OBJECTS) $(EXTRA_OBJECTS) $(EXECUTABLES) $(PDBS) \
+	rm -f $(ethereal_OBJECTS) $(EXTRA_OBJECTS) $(EXECUTABLES) $(PDB_FILE) \
 		tethereal.obj editcap.obj mergecap.obj text2pcap.obj \
 		text2pcap-scanner.obj text2pcap-scanner.c register.c \
 		rdps.obj rdps.pdb config.h ps.c packet-ncp2222.c register.c
diff --git a/README.win32 b/README.win32
index 79a85f7463..3b5e10c07e 100644
--- a/README.win32
+++ b/README.win32
@@ -1,4 +1,4 @@
-$Id: README.win32,v 1.29 2001/11/07 18:49:57 guy Exp $
+$Id: README.win32,v 1.30 2001/12/19 19:16:11 guy Exp $
 
 Installing Ethereal, Tethereal, and Editcap on Win32
 ====================================================
@@ -13,18 +13,21 @@ The installation package allows you to install:
 	o Editcap - a console, line-mode utility to convert
 		capture files from one format to another.
 		(The same functions are available in Ethereal)
+        o Text2Pcap - a console, line-mode utility to generate 
+		a capture file from an ASCII hexdump of packets
+        o Mergecap - a console, line-mode utility to merge two 
+		capture files into one
 
 Additionally, the installation package contains a "plugins"
-option, which installs the Gryphon and MGCP dissector plugins
+option, which installs the Gryphon, MGCP and GIOP dissector plugins
 for use with Ethereal and Tethereal.
 
-The "Debug PDB Files" are useful to install if you are experiencing
-a crash when running and Ethereal. Dr. Watson or your debugger
-can use the information in these files to provide useful information
-to the Ethereal developers that will help them pinpoint the problem.
-However, for general usage of Ethereal, these files are not
-necessary. In the future, we may package them separately from
-Ethereal.
+All binaries in Ethereal package are now built with debugging
+information embedded. If you are experiencing a crash when running
+Ethereal or other binaries, Dr. Watson or your debugger
+can use the information embedded in the binary to provide useful 
+information to the Ethereal developers that will help them pinpoint 
+the problem. 
 
 In the past, two versions of Ethereal binaries were published -- a
 version that could capture packets and a version which could not.
diff --git a/config.nmake b/config.nmake
index 51168a0b43..31810bbea4 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.18 2001/12/12 01:29:01 guy Exp $
+# $Id: config.nmake,v 1.19 2001/12/19 19:16:11 guy Exp $
 
 VERSION=0.8.20
 RC_VERSION=0,8,20
@@ -14,6 +14,8 @@ PCAP_DIR=F:\gram\win32tools\WPdpack
 
 LOCAL_CFLAGS=-Zi
 LOCAL_LDFLAGS=/DEBUG
+
+# Set PDB_FILE according to your VC++ version 
 PDB_FILE=vc60.pdb
 
 # Set path if you need to find some binary
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 1dcfc50528..01d61838b0 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.8 2001/12/12 01:29:07 guy Exp $
+# $Id: Makefile.nmake,v 1.9 2001/12/19 19:16:12 guy Exp $
 #
 #
 # NSIS is a free packager/installer/uninstaller program for Win32.
@@ -12,8 +12,6 @@ include ../../config.nmake
 
 EXE=../../ethereal.exe ../../tethereal.exe ../../editcap.exe \
 	../../text2pcap.exe ../../mergecap.exe
-PDB=../../ethereal.pdb ../../tethereal.pdb ../../editcap.pdb \
-	../../text2pcap.pdb ../../mergecap.pdb
 DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll
 DOC=../../doc/ethereal.html		\
 	../../doc/tethereal.html	\
@@ -27,7 +25,7 @@ GPL=GPL.txt
 PLUGINS=../../plugins/mgcp/mgcp.dll	\
 	../../plugins/gryphon/gryphon.dll
 
-DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(PLUGINS) $(PDB)
+DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(PLUGINS) 
 
 
 ethereal-setup.exe : ethereal.nsi $(DELIVERABLES)
diff --git a/packaging/nsis/ethereal.nsi.in b/packaging/nsis/ethereal.nsi.in
index 491ab1c13c..8f8a28fb41 100644
--- a/packaging/nsis/ethereal.nsi.in
+++ b/packaging/nsis/ethereal.nsi.in
@@ -1,7 +1,7 @@
 ;
 ; ethereal.nsi
 ;
-; $Id: ethereal.nsi.in,v 1.10 2001/12/12 07:52:23 guy Exp $
+; $Id: ethereal.nsi.in,v 1.11 2001/12/19 19:16:12 guy Exp $
 
 ; ============================================================================
 ; Header configuration
@@ -122,16 +122,6 @@ File "..\..\plugins\giop\cosnaming.dll"
 File "..\..\plugins\giop\coseventcomm.dll"
 SectionEnd
 
-Section "Debug PDB Files"
-;-------------------------------------------
-SetOutPath $INSTDIR
-File "..\..\ethereal.pdb"
-File "..\..\tethereal.pdb"
-File "..\..\editcap.pdb"
-File "..\..\mergecap.pdb"
-File "..\..\text2pcap.pdb"
-SectionEnd
-
 SectionDivider
 ;-------------------------------------------
 
@@ -162,7 +152,6 @@ Delete "$INSTDIR\mobileipv4.xml"
 Delete "$INSTDIR\nasreq.xml"
 Delete "$INSTDIR\sunping.xml"
 Delete "$INSTDIR\*.exe"
-Delete "$INSTDIR\*.pdb"
 Delete "$INSTDIR\*.html"
 Delete "$INSTDIR\*.dll"
 Delete "$INSTDIR\plugins\@VERSION@\coseventcomm.dll"