osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add a new "cleanbld.bat" script, for Windows; it removes "config.h" 

files that might be left over from a UNIX build, so that they'll be
reconstructed from the "config.h.win32" files on a Windows build.
(If you have "config.h" files left over from a UNIX build, the Windows
build will fail.)

Update "README.win32" to mention "cleanbld.bat", and to correctly list
the files generated using tools that don't come with Windows or MSVC++.
Also note that some of them can't be built on UNIX systems.

svn path=/trunk/; revision=3713
This commit is contained in:
Guy Harris 2001-07-13 08:14:03 +00:00
parent 4eb4021854
commit e2a238b16b
3 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
# $Id: Makefile.am,v 1.351 2001/07/12 20:16:28 guy Exp $
# $Id: Makefile.am,v 1.352 2001/07/13 08:14:03 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@ -688,6 +688,7 @@ EXTRA_DIST = \
aclocal-flags \
capture-wpcap.c \
capture-wpcap.h \
cleanbld.bat \
config.h.win32 \
config.nmake \
debian/README.debian \

33
README.win32
View File

@ -1,4 +1,4 @@
$Id: README.win32,v 1.23 2001/04/10 12:29:22 gram Exp $
$Id: README.win32,v 1.24 2001/07/13 08:14:03 guy Exp $
Installing Ethereal, Tethereal, and Editcap on Win32
====================================================
@ -156,6 +156,11 @@ and link with MSVC. When installing MSVC, you can have your
system's environment set up to always allow compiling from the
command line, or you can invoke the vcvars32.bat script.
The first time you build Ethereal, run the script "cleanbld.bat" to make
sure that the "config.h" files will be reconstructed from the
"config.h.win32" files. (If, for example, you have "config.h" files
left over from a Unix build, a Windows build will fail.)
In the ethereal directory, type "nmake -f makefile.nmake". It will
recurse into the subdirectories as appropriate.
@ -167,8 +172,17 @@ to generate C source. The "special" files and their requisite tools are:
Source Output Tool
------ ------ ----
config.h.in config.h sed
dfilter-scanner.l *.c Flex
config.h.win32 config.h sed
epan/config.h.win32 epan/config.h sed
image/ethereal.rc.in image/ethereal.rc sed
image/tethereal.rc.in image/tethereal.rc sed
image/editcap.rc.in image/editcap.rc sed
image/mergecap.rc.in image/mergecap.rc sed
image/text2pcap.rc.in image/text2pcap.rc sed
packaging/nsis/ethereal.nsi.in packaging/ethereal.nsi sed
wiretap/config.h.win32 wiretap/config.h sed
epan/dfilter/dfilter-scanner.l epan/dfilter/*.c Flex
text2pcap-scanner.l *.c Flex
wiretap/ascend-scanner.l *.c Flex
wiretap/ascend-grammar.y *.c,*.h Bison/Yacc
ncp2222.py packet-ncp2222.c Python
@ -186,10 +200,15 @@ matters a lot on Win32. If for some reason you want to build register.c
with the shell script, uncomment out the action line for the register.c
target in Makefile.nmake.
If you have a Unix system handy, you can first build on Unix
to create the source files that these tools make, then run the build
on Windows. That will avoid the need for these tools on your Windows
computer.
If you have a Unix system handy, you can first build on Unix to create
most of the source files that these tools make, then run the build on
Windows. That will avoid the need for these tools on your Windows
computer. (This won't work for the files in the "image" directory,
however, as those aren't built on Unix - they're only for Windows
builds. It also won't work for the "config.h" files; whilst those are
built for Unix, they're specific to the platform on which you're
building, and the "config.h" files constructed for a Unix build will not
work with a Windows build.)
If you don't have a Unix system handy, most of those tools are available for
Win32 systems as part of the Cygwin package:

34
cleanbld.bat Normal file
View File

@ -0,0 +1,34 @@
echo off
rem cleanbld.bat
rem Script to clean up from a build on another platform
rem
rem $Id: cleanbld.bat,v 1.1 2001/07/13 08:14:03 guy Exp $
rem
rem Ethereal - Network traffic analyzer
rem By Gerald Combs <gerald@ethereal.com>
rem Copyright 1998 Gerald Combs
rem
rem This program is free software; you can redistribute it and/or
rem modify it under the terms of the GNU General Public License
rem as published by the Free Software Foundation; either version 2
rem of the License, or (at your option) any later version.
rem
rem This program is distributed in the hope that it will be useful,
rem but WITHOUT ANY WARRANTY; without even the implied warranty of
rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
rem GNU General Public License for more details.
rem
rem You should have received a copy of the GNU General Public License
rem along with this program; if not, write to the Free Software
rem Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
rem
rem Remove the config.h files that are built from config.h.win32 files,
rem so that a build will reconstruct them; this should be run the first
rem time you do a Microsoft Visual C++ build, so that, for example, if
rem you've done a UNIX build, the build doesn't use the config.h files
rem from that build (using those config.h files will cause the build
rem to fail).
rem
del/f config.h
del/f epan\config.h
del/f wiretap\config.h