forked from osmocom/wireshark
Use sed in the Win32 build to place the version in various files.
We us $(VERSION), defined in the top-level config.nmake, to replace @VERSION@ in various files. $(RC_VERSION) and $(WTAP_VERSION) are similarly used. svn path=/trunk/; revision=3258
This commit is contained in:
Gilbert Ramirez
parent
c4979d817a
commit
a8d864bca7
|
|
@ -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.93 2001/04/04 01:00:18 guy Exp $
|
||||
# $Id: Makefile.nmake,v 1.94 2001/04/05 04:39:23 gram Exp $
|
||||
|
||||
include config.nmake
|
||||
include <win32.mak>
|
||||
|
|
@ -267,7 +267,7 @@ EXECUTABLES=ethereal.exe tethereal.exe editcap.exe
|
|||
|
||||
RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res
|
||||
|
||||
all: tools wiretap gtk epan $(EXECUTABLES) $(RESOURCES)
|
||||
all: tools wiretap gtk epan image $(EXECUTABLES) $(RESOURCES)
|
||||
|
||||
ethereal.exe : config.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib plugins
|
||||
@echo Linking $@
|
||||
|
|
@ -293,7 +293,7 @@ dftest.exe : $(dftest_OBJECTS) $(EXTRA_OBJECTS)
|
|||
<<
|
||||
|
||||
config.h : config.h.win32
|
||||
copy config.h.win32 $@
|
||||
sed -e s/@VERSION@/$(VERSION)/ < config.h.win32 > $@
|
||||
|
||||
ps.c : rdps.exe print.ps
|
||||
rdps print.ps ps.c
|
||||
|
|
@ -322,6 +322,8 @@ clean:
|
|||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
|
||||
cd ../tools
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
|
||||
cd ../image
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
|
||||
cd ..
|
||||
|
||||
tools::
|
||||
|
|
@ -329,6 +331,11 @@ tools::
|
|||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
|
||||
cd ..
|
||||
|
||||
image::
|
||||
cd image
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
|
||||
cd ..
|
||||
|
||||
wiretap::
|
||||
cd wiretap
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: config.h.win32,v 1.25 2001/03/05 22:53:36 gram Exp $ */
|
||||
/* $Id: config.h.win32,v 1.26 2001/04/05 04:39:23 gram Exp $ */
|
||||
/* config.h.win32 Generated manually. :-) */
|
||||
/* config.h. Generated automatically by configure. */
|
||||
/* config.h.in. Generated automatically from configure.in by autoheader. */
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
#define PACKAGE "ethereal"
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "0.8.16"
|
||||
#define VERSION "@VERSION@"
|
||||
|
||||
/* Plugin installation directory... */
|
||||
#define PLUGIN_DIR "C:/ethereal/plugins/0.8.16"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
# $Id: config.nmake,v 1.10 2001/04/04 04:50:04 gram Exp $
|
||||
# $Id: config.nmake,v 1.11 2001/04/05 04:39:23 gram Exp $
|
||||
|
||||
VERSION=0.8.16
|
||||
RC_VERSION=0,8,16
|
||||
WTAP_VERSION=0.0
|
||||
|
||||
GTK_VERSION=1.3
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ ethereal.lib : config.h $(OBJECTS)
|
|||
lib /out:ethereal.lib $(OBJECTS)
|
||||
|
||||
config.h : config.h.win32
|
||||
copy config.h.win32 $@
|
||||
sed -e s/@VERSION@/$(VERSION)/ < config.h.win32 > $@
|
||||
|
||||
clean:
|
||||
rm -f $(OBJECTS) ethereal.lib
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: config.h.win32,v 1.5 2001/03/05 22:53:38 gram Exp $ */
|
||||
/* $Id: config.h.win32,v 1.6 2001/04/05 04:39:24 gram Exp $ */
|
||||
/* config.h.win32 Generated manually. :-) */
|
||||
/* config.h. Generated automatically by configure. */
|
||||
/* config.h.in. Generated automatically from configure.in by autoheader. */
|
||||
|
|
@ -105,4 +105,4 @@
|
|||
#define PACKAGE "libethereal.a"
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "0.8.16"
|
||||
#define VERSION "@VERSION@"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
#
|
||||
# $Id: Makefile.nmake,v 1.1 2001/04/05 04:39:26 gram Exp $
|
||||
#
|
||||
|
||||
include ..\config.nmake
|
||||
|
||||
ALL_RC=ethereal.rc tethereal.rc editcap.rc
|
||||
all : $(ALL_RC)
|
||||
|
||||
ethereal.rc : ethereal.rc.in
|
||||
sed -e s/@VERSION@/$(VERSION)/ \
|
||||
-e s/@RC_VERSION@/$(RC_VERSION)/ \
|
||||
< ethereal.rc.in > $@
|
||||
|
||||
tethereal.rc : tethereal.rc.in
|
||||
sed -e s/@VERSION@/$(VERSION)/ \
|
||||
-e s/@RC_VERSION@/$(RC_VERSION)/ \
|
||||
< tethereal.rc.in > $@
|
||||
|
||||
editcap.rc : editcap.rc.in
|
||||
sed -e s/@VERSION@/$(VERSION)/ \
|
||||
-e s/@RC_VERSION@/$(RC_VERSION)/ \
|
||||
< editcap.rc.in > $@
|
||||
|
||||
clean :
|
||||
rm -f $(ALL_RC)
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
ETHEREAL_ICON ICON "ethereal.ico"
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 0,8,16,0
|
||||
PRODUCTVERSION 0,8,16,0
|
||||
FILEVERSION @RC_VERSION@,0
|
||||
PRODUCTVERSION @RC_VERSION@,0
|
||||
FILEFLAGSMASK 0x0L
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x3L
|
||||
|
|
@ -21,12 +21,12 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "The Ethereal developer community\0"
|
||||
VALUE "FileDescription", "Editcap\0"
|
||||
VALUE "FileVersion", "0.8.16\0"
|
||||
VALUE "InternalName", "Editcap 0.8.16\0"
|
||||
VALUE "FileVersion", "@VERSION@\0"
|
||||
VALUE "InternalName", "Editcap @VERSION@\0"
|
||||
VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@xiexie.org> and others\0"
|
||||
VALUE "OriginalFilename", "Editcap.exe\0"
|
||||
VALUE "ProductName", "Editcap\0"
|
||||
VALUE "ProductVersion", "0.8.16\0"
|
||||
VALUE "ProductVersion", "@VERSION@\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
ETHEREAL_ICON ICON "ethereal.ico"
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 0,8,16,0
|
||||
PRODUCTVERSION 0,8,16,0
|
||||
FILEVERSION @RC_VERSION@,0
|
||||
PRODUCTVERSION @RC_VERSION@,0
|
||||
FILEFLAGSMASK 0x0L
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x3L
|
||||
|
|
@ -21,12 +21,12 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "The Ethereal developer community, http://www.ethereal.com/\0"
|
||||
VALUE "FileDescription", "Ethereal\0"
|
||||
VALUE "FileVersion", "0.8.16\0"
|
||||
VALUE "InternalName", "Ethereal 0.8.16\0"
|
||||
VALUE "FileVersion", "@VERSION@\0"
|
||||
VALUE "InternalName", "Ethereal @VERSION@\0"
|
||||
VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@xiexie.org> and others\0"
|
||||
VALUE "OriginalFilename", "Ethereal.exe\0"
|
||||
VALUE "ProductName", "Ethereal\0"
|
||||
VALUE "ProductVersion", "0.8.16\0"
|
||||
VALUE "ProductVersion", "@VERSION@\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
ETHEREAL_ICON ICON "ethereal.ico"
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 0,8,16,0
|
||||
PRODUCTVERSION 0,8,16,0
|
||||
FILEVERSION @RC_VERSION@,0
|
||||
PRODUCTVERSION @RC_VERSION@,0
|
||||
FILEFLAGSMASK 0x0L
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x3L
|
||||
|
|
@ -21,12 +21,12 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "The Ethereal developer community\0"
|
||||
VALUE "FileDescription", "Tethereal\0"
|
||||
VALUE "FileVersion", "0.8.16\0"
|
||||
VALUE "InternalName", "Tethereal 0.8.16\0"
|
||||
VALUE "FileVersion", "@VERSION@\0"
|
||||
VALUE "InternalName", "Tethereal @VERSION@\0"
|
||||
VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@xiexie.org> and others\0"
|
||||
VALUE "OriginalFilename", "Tethereal.exe\0"
|
||||
VALUE "ProductName", "Tethereal\0"
|
||||
VALUE "ProductVersion", "0.8.16\0"
|
||||
VALUE "ProductVersion", "@VERSION@\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# $Id: Makefile.nmake,v 1.2 2001/04/04 20:08:16 gram Exp $
|
||||
# $Id: Makefile.nmake,v 1.3 2001/04/05 04:39:27 gram Exp $
|
||||
#
|
||||
#
|
||||
# NSIS is a free packager/installer/uninstaller program for Win32.
|
||||
|
|
@ -25,5 +25,10 @@ PLUGINS=../../plugins/mgcp/mgcp.dll \
|
|||
|
||||
DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(PLUGINS) $(PDB)
|
||||
|
||||
ethereal.nsi : ethereal.nsi.in
|
||||
sed -e s/@VERSION@/$(VERSION)/ \
|
||||
-e s/@WTAP_VERSION@/$(WTAP_VERSION)/ \
|
||||
< ethereal.nsi.in > ethereal.nsi
|
||||
|
||||
ethereal-setup.exe : ethereal.nsi $(DELIVERABLES)
|
||||
$(MAKENSIS) ethereal.nsi
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;
|
||||
; ethereal.nsi
|
||||
;
|
||||
; $Id: ethereal.nsi,v 1.1 2001/04/04 04:50:05 gram Exp $
|
||||
; $Id: ethereal.nsi.in,v 1.1 2001/04/05 04:39:27 gram Exp $
|
||||
|
||||
; ============================================================================
|
||||
; Header configuration
|
||||
|
|
@ -58,7 +58,7 @@ ShowInstDetails show
|
|||
Section "-Required"
|
||||
;-------------------------------------------
|
||||
SetOutPath $INSTDIR
|
||||
File "..\..\wiretap\wiretap-0.0.dll"
|
||||
File "..\..\wiretap\wiretap-@WTAP_VERSION@.dll"
|
||||
File "c:\program files\common files\GNU\iconv-1.3.dll"
|
||||
File "c:\program files\common files\GNU\glib-1.3.dll"
|
||||
File "c:\program files\common files\GNU\gmodule-1.3.dll"
|
||||
|
|
@ -98,7 +98,7 @@ File "..\..\doc\editcap.html"
|
|||
Section "Plugins"
|
||||
SectionIn 1,2
|
||||
;-------------------------------------------
|
||||
SetOutPath $INSTDIR\plugins\0.8.16
|
||||
SetOutPath $INSTDIR\plugins\@VERSION@
|
||||
File "..\..\plugins\gryphon\gryphon.dll"
|
||||
File "..\..\plugins\mgcp\mgcp.dll"
|
||||
|
||||
|
|
@ -128,12 +128,13 @@ Delete "$INSTDIR\README*"
|
|||
Delete "$INSTDIR\*.exe"
|
||||
Delete "$INSTDIR\*.pdb"
|
||||
Delete "$INSTDIR\*.html"
|
||||
Delete "$INSTDIR\*.dll"
|
||||
Delete "$INSTDIR\plugins\0.8.16\*.dll"
|
||||
Delete "$INSTDIR\wiretap-@WTAP_VERSION@.dll"
|
||||
Delete "$INSTDIR\plugins\@VERSION@\gryphon.dll"
|
||||
Delete "$INSTDIR\plugins\@VERSION@\mgcp.dll"
|
||||
Delete "$SMPROGRAMS\Ethereal\*.*"
|
||||
|
||||
RMDir "$SMPROGRAMS\Ethereal"
|
||||
RMDir "$INSTDIR\plugins\0.8.16"
|
||||
RMDir "$INSTDIR\plugins\@VERSION@"
|
||||
RMDir "$INSTDIR\plugins"
|
||||
RMDir "$INSTDIR"
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# $Id: Makefile.nmake,v 1.17 2001/03/23 02:05:29 gram Exp $
|
||||
# $Id: Makefile.nmake,v 1.18 2001/04/05 04:39:29 gram Exp $
|
||||
#
|
||||
|
||||
include ..\config.nmake
|
||||
|
|
@ -65,7 +65,7 @@ ascend-scanner.c : ascend-scanner.l
|
|||
|
||||
|
||||
config.h : config.h.win32
|
||||
copy config.h.win32 $@
|
||||
sed -e s/@VERSION@/$(WTAP_VERSION)/ < config.h.win32 > $@
|
||||
|
||||
clean :
|
||||
rm -f $(OBJECTS) ascend-grammar.c ascend-grammar.h ascend-scanner.c \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: config.h.win32,v 1.6 2000/11/22 07:20:27 guy Exp $ */
|
||||
/* $Id: config.h.win32,v 1.7 2001/04/05 04:39:29 gram Exp $ */
|
||||
/* config.h.win32 Generated manually. :-) */
|
||||
/* config.h. Generated automatically by configure. */
|
||||
/* config.h.in. Generated automatically from configure.in by autoheader. */
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
#define PACKAGE "libwtap.a"
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "0.0.0"
|
||||
#define VERSION "@VERSION@"
|
||||
|
||||
#define HAVE_WINSOCK_H 1
|
||||
#define HAVE_IO_H 1
|
||||
|
|
|
|||
Loading…
Reference in New Issue