[Motonori Shindo <mshindo@xxxxxxxxxxx>]

Hi,

From: Motonori Shindo <mshindo@xxxxxxxxxxx>
Subject: Re: [Ethereal-dev] Re: How do I get .pdb file under Win32
Date: Thu, 13 Dec 2001 11:57:48 +0900 (JST)

> However, given that we haven't come up with an elegant way how to
> generate separate *.pdb files within the framework that current
> win32.mak provides, I personally think that we should go for an
> embedded model. Any comment??

Here's a patch to adopt an embedded model. I also added some
annotation to README.win32 to reflect recent updates.

=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=
 +----+----+     
 |.. .|    |     Motonori Shindo
 |_~__|    |     
 | .. |~~_~|     Sr. Systems Engineer
 | .  |    |     CoSine Communications Inc.
 +----+----+     
 C o S i n e     e-mail:  mshindo@xxxxxxxxxxxxx 
Communications
=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=

Index: Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/Makefile.nmake,v
retrieving revision 1.153
diff -u -r1.153 Makefile.nmake
--- Makefile.nmake	2001/12/12 01:29:01	1.153
+++ Makefile.nmake	2001/12/13 04:54:25
@@ -328,10 +328,6 @@
 
 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)
@@ -404,7 +400,7 @@
 	$(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
Index: README.win32
===================================================================
RCS file: /cvsroot/ethereal/README.win32,v
retrieving revision 1.29
diff -u -r1.29 README.win32
--- README.win32	2001/11/07 18:49:57	1.29
+++ README.win32	2001/12/13 04:54:26
@@ -13,18 +13,21 @@
 	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.
Index: config.nmake
===================================================================
RCS file: /cvsroot/ethereal/config.nmake,v
retrieving revision 1.18
diff -u -r1.18 config.nmake
--- config.nmake	2001/12/12 01:29:01	1.18
+++ config.nmake	2001/12/13 04:54:27
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.18 2001/12/12 01:29:01 guy Exp $
+# $Id: config.nmake,v 1.17 2001/10/12 17:17:04 gerald Exp $
 
 VERSION=0.8.20
 RC_VERSION=0,8,20
@@ -14,6 +14,8 @@
 
 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
Index: packaging/nsis/Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/packaging/nsis/Makefile.nmake,v
retrieving revision 1.8
diff -u -r1.8 Makefile.nmake
--- Makefile.nmake	2001/12/12 01:29:07	1.8
+++ Makefile.nmake	2001/12/13 04:54:31
@@ -12,8 +12,6 @@
 
 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 @@
 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)
Index: packaging/nsis/ethereal.nsi.in
===================================================================
RCS file: /cvsroot/ethereal/packaging/nsis/ethereal.nsi.in,v
retrieving revision 1.10
diff -u -r1.10 ethereal.nsi.in
--- ethereal.nsi.in	2001/12/12 07:52:23	1.10
+++ ethereal.nsi.in	2001/12/13 04:54:32
@@ -122,16 +122,6 @@
 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\nasreq.xml"
 Delete "$INSTDIR\sunping.xml"
 Delete "$INSTDIR\*.exe"
-Delete "$INSTDIR\*.pdb"
 Delete "$INSTDIR\*.html"
 Delete "$INSTDIR\*.dll"
 Delete "$INSTDIR\plugins\@VERSION@\coseventcomm.dll"

This message has been 'sanitized'.  This means that potentially
dangerous content has been rewritten or removed.  The following
log describes which actions were taken.

Sanitizer (start="1008221396"):
  Replaced MIME boundary: >>--Next_Part--<<
                    with: >>MIMEStream=_0+125715_0002111662_9051357042<<
  Writer (pos="1304"):
    Total modifications so far: 1

  Part (pos="1350"):
    SanitizeFile (filename="unnamed.txt", mimetype="Text/Plain"):
      Match (rule="2"):
        Enforced policy: accept

  Part (pos="2317"):
    SanitizeFile (filename="embedded-debug-info.patch", mimetype="Text/Plain"):
      Match (rule="2"):
        Enforced policy: accept


Anomy 0.0.0 : Sanitizer.pm
$Id: Sanitizer.pm,v 1.32 2001/10/11 19:27:15 bre Exp $