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 /image | |
| parent | 461b6d35ee6f8547427206f23633529e61cc3e1f (diff) | |
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
Diffstat (limited to 'image')
| -rw-r--r-- | image/Makefile.nmake | 5 | ||||
| -rwxr-xr-x | image/ethereal.exe.manifest.in | 2 |
2 files changed, 4 insertions, 3 deletions
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" |