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

If we have an SVN revision number, use it as the build number under Windows 

instead of "0".

svn path=/trunk/; revision=24376
This commit is contained in:
Gerald Combs 2008-02-18 18:08:14 +00:00
parent 6dd33f26f6
commit 7abeb02747
37 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.nmake
View File

@ -12,6 +12,7 @@
VERSION_MAJOR=0
VERSION_MINOR=99
VERSION_MICRO=8
VERSION_BUILD=0
# It's recommended to change VERSION_EXTRA for your own custom builds
# e.g. "-SVN-12345"
VERSION_EXTRA=
@ -593,7 +594,7 @@ XMLLINT="xmllint"
#
VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)$(VERSION_EXTRA)
RC_VERSION=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO)
RC_VERSION=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO),$(VERSION_BUILD)
WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR).$(WTAP_VERSION_MICRO)
RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO)

4
image/capinfos.rc.in
View File

@ -3,8 +3,8 @@
WIRESHARK_ICON ICON "wireshark.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@,0
FILEVERSION @RC_VERSION@
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x3L

4
image/dumpcap.rc.in
View File

@ -3,8 +3,8 @@
WIRESHARK_ICON ICON "wireshark.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@,0
FILEVERSION @RC_VERSION@
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x3L

4
image/editcap.rc.in
View File

@ -3,8 +3,8 @@
WIRESHARK_ICON ICON "wireshark.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@,0
FILEVERSION @RC_VERSION@
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x3L

4
image/libwireshark.rc.in
View File

@ -1,8 +1,8 @@
#include "winver.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@,0
FILEVERSION @RC_VERSION@
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x3L

4
image/mergecap.rc.in
View File

@ -3,8 +3,8 @@
WIRESHARK_ICON ICON "wireshark.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@,0
FILEVERSION @RC_VERSION@
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x3L

4
image/rawshark.rc.in
View File

@ -3,8 +3,8 @@
WIRESHARK_ICON ICON "wireshark.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@,0
FILEVERSION @RC_VERSION@
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x3L

4
image/text2pcap.rc.in
View File

@ -3,8 +3,8 @@
WIRESHARK_ICON ICON "wireshark.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@,0
FILEVERSION @RC_VERSION@
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x3L

4
image/tshark.rc.in
View File

@ -3,8 +3,8 @@
WIRESHARK_ICON ICON "wireshark.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@,0
FILEVERSION @RC_VERSION@
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x3L

4
image/wireshark.rc.in
View File

@ -6,8 +6,8 @@ WIRESHARK_ICON1 ICON "wireshark.ico"
WIRESHARK_ICON2 ICON "wiresharkdoc.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@,0
FILEVERSION @RC_VERSION@
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x3L

3
make-version.pl
View File

@ -198,6 +198,9 @@ sub update_config_nmake
if ($line =~ /^VERSION_EXTRA=/) {
$line = "VERSION_EXTRA=$package_string\n";
}
if ($line =~ /^VERSION_BUILD=/ && int($revision) > 0) {
$line = "VERSION_BUILD=$revision\n";
}
$contents .= $line
}

2
plugins/agentx/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/artnet/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/asn1/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/ciscosm/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/docsis/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/easy_codec/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/enttec/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/ethercat/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/gryphon/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/irda/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/lwres/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/m2m/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/mate/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/opcua/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/opsi/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/pcli/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/profinet/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/rlm/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/rtnet/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/rudp/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/sbus/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/stats_tree/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/unistim/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/v5ua/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/wimax/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

2
plugins/wimaxasncp/plugin.rc.in
View File

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION @RC_MODULE_VERSION@
PRODUCTVERSION @RC_VERSION@,0
PRODUCTVERSION @RC_VERSION@
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG