diff options
| author | Gerald Combs <gerald@wireshark.org> | 2006-02-14 15:14:41 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2006-02-14 15:14:41 +0000 |
| commit | 0d3244a6fe3f44c0d626f8fe08d5fa0ca78e65d2 (patch) | |
| tree | 209d888626b30332c8f1b56f35f696724998a604 | |
| parent | 461b6d35ee6f8547427206f23633529e61cc3e1f (diff) | |
| download | wireshark-0d3244a6fe3f44c0d626f8fe08d5fa0ca78e65d2.tar.gz | |
Split the version under Windows into its major, minor, and micro
components. Use them to build the VERSION, RC_VERSION, and manifest
versions (the latter two are picky about formatting). This would
probably be useful on the autoconf side, but I didn't see an obvious
way to implement it.
svn path=/trunk/; revision=17302
| -rw-r--r-- | config.nmake | 9 | ||||
| -rw-r--r-- | image/Makefile.nmake | 5 | ||||
| -rwxr-xr-x | image/ethereal.exe.manifest.in | 2 | ||||
| -rwxr-xr-x | make-version.pl | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/config.nmake b/config.nmake index 018ee4c75e..6b574215f2 100644 --- a/config.nmake +++ b/config.nmake @@ -4,7 +4,12 @@ # in the file README.win32. # The current Ethereal version -VERSION=0.10.14 +# VERSION_EXTRA can be used for custom builds, e.g. "-SVN-12345" +VERSION_MAJOR=0 +VERSION_MINOR=10 +VERSION_MICRO=14 +VERSION_EXTRA= +VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)$(VERSION_EXTRA) # # The RC_VERSION should be comma-separated, not dot-separated, @@ -17,7 +22,7 @@ VERSION=0.10.14 # number to be correctly displayed in the explorer properties dialog # for the executables, and XP's tooltip, rather than 0.0.0.0." # -RC_VERSION=0,10,14 +RC_VERSION=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO) # The version of the wiretap library WTAP_VERSION=0.3 diff --git a/image/Makefile.nmake b/image/Makefile.nmake index c9689912c1..a765ef0b22 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -8,8 +8,9 @@ ALL_RC=ethereal.rc libethereal.rc tethereal.rc capinfos.rc editcap.rc text2pcap. all : $(ALL_RC) ethereal.exe.manifest: ethereal.exe.manifest.in ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ + sed -e s/@VERSION_MAJOR@/$(VERSION_MAJOR)/ \ + -e s/@VERSION_MINOR@/$(VERSION_MINOR)/ \ + -e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \ < ethereal.exe.manifest.in > $@ ethereal.rc : ethereal.rc.in ethereal.exe.manifest ..\config.nmake diff --git a/image/ethereal.exe.manifest.in b/image/ethereal.exe.manifest.in index a64d5a50d6..d501606126 100755 --- a/image/ethereal.exe.manifest.in +++ b/image/ethereal.exe.manifest.in @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="@VERSION@.0" + version="@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_MICRO@.0" processorArchitecture="X86" name="EtherealDevelopmentTeam.Ethereal" type="win32" diff --git a/make-version.pl b/make-version.pl index 2cf56acbd9..dca0307a51 100755 --- a/make-version.pl +++ b/make-version.pl @@ -150,8 +150,8 @@ sub update_config_nmake open(CFGIN, "< config.nmake") || die "Can't read config.nmake!"; while ($line = <CFGIN>) { - if ($line =~ /^VERSION=(\d+)\.(\d+).(\d+)/) { - $line = "VERSION=$1.$2.$3$package_string\n"; + if ($line =~ /^VERSION_EXTRA=/) { + $line = "VERSION_EXTRA=$package_string\n"; } $contents .= $line } |