Add Windows version info resource.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20163 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/plugins/lwres/Makefile.am b/plugins/lwres/Makefile.am
index 044cd06ef8e19f39bcd96e0229f7bead73b6c4eb..d05ff7464dcd6e09a6a5fc2f31259b60cc0a8a38 100644 (file)
--- a/plugins/lwres/Makefile.am
+++ b/plugins/lwres/Makefile.am
@@ -115,4 +115,7 @@ MAINTAINERCLEANFILES = \
 
 EXTRA_DIST = \
        Makefile.common         \
 
 EXTRA_DIST = \
        Makefile.common         \

-       Makefile.nmake
+       Makefile.nmake          \
+       moduleinfo.nmake        \
+       plugin.rc.in
+

diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake
index 6aa371113e887d4f6a97d65dae1f5546af28368b..4e89cf9b32317e7b127809fa70f12ef6cb4de393 100644 (file)
--- a/plugins/lwres/Makefile.nmake
+++ b/plugins/lwres/Makefile.nmake
@@ -1,12 +1,11 @@
 # Makefile.nmake
 # Makefile.nmake

-# nmake file for lwres plugin
+# nmake file for Wireshark plugin

 #
 # $Id$
 #
 
 include ..\..\config.nmake
 #
 # $Id$
 #
 
 include ..\..\config.nmake

-
-############### no need to modify below this line #########
+include moduleinfo.nmake

 
 include Makefile.common
 
 
 include Makefile.common
 


@@ -21,12 +20,26 @@ CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

-OBJECTS=$(DISSECTOR_OBJECTS) plugin.obj
+DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
+
+OBJECTS = $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) plugin.obj
+
+RESOURCE=$(PLUGIN_NAME).res
+
+all: $(PLUGIN_NAME).dll

 
 

-lwres.dll lwres.exp lwres.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) 
-       link -dll /out:lwres.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH)  \
-       $(GLIB_LIBS)
+$(PLUGIN_NAME).rc : moduleinfo.nmake
+       sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \
+       -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \
+       -e s/@RC_VERSION@/$(RC_VERSION)/ \
+       -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \
+       -e s/@PACKAGE@/$(PACKAGE)/ \
+       -e s/@VERSION@/$(VERSION)/ \
+       < plugin.rc.in > $@

 
 

+$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
+       link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
+       $(GLIB_LIBS) $(RESOURCE)

 #
 # Build plugin.c, which contains the plugin version[] string, a
 # function plugin_register() that calls the register routines for all
 #
 # Build plugin.c, which contains the plugin version[] string, a
 # function plugin_register() that calls the register routines for all


@@ -72,7 +85,8 @@ plugin.c: $(DISSECTOR_SRC)
 !ENDIF
 
 clean:
 !ENDIF
 
 clean:

-       rm -f $(OBJECTS) lwres.dll lwres.exp lwres.lib *.pdb
+       rm -f $(OBJECTS) $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp \
+           $(RESOURCE) $(PLUGIN_NAME).rc $(PLUGIN_NAME).lib *.pdb

 
 distclean: clean
 
 
 distclean: clean
 

diff --git a/plugins/lwres/moduleinfo.nmake b/plugins/lwres/moduleinfo.nmake
new file mode 100644 (file)
index 0000000..d5b24f5
--- /dev/null
+++ b/plugins/lwres/moduleinfo.nmake
@@ -0,0 +1,28 @@
+#
+# $Id$
+#
+
+# The name
+PACKAGE=lwres
+
+# The version
+MODULE_VERSION_MAJOR=0
+MODULE_VERSION_MINOR=0
+MODULE_VERSION_MICRO=1
+MODULE_VERSION_EXTRA=0
+
+#
+# The RC_VERSION should be comma-separated, not dot-separated, 
+# as per Graham Bloice's message in
+#
+#      http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html
+#
+# "The RC_VERSION variable in config.nmake should be comma separated. 
+# This allows the resources to be built correctly and the version
+# number to be correctly displayed in the explorer properties dialog
+# for the executables, and XP's tooltip, rather than 0.0.0.0."
+#
+
+MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA)
+RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA)
+

diff --git a/plugins/lwres/plugin.rc.in b/plugins/lwres/plugin.rc.in
new file mode 100644 (file)
index 0000000..e394a4f
--- /dev/null
+++ b/plugins/lwres/plugin.rc.in
@@ -0,0 +1,33 @@
+#include "winver.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @RC_MODULE_VERSION@
+ PRODUCTVERSION @RC_VERSION@,0
+ FILEFLAGSMASK 0x0L
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG
+#else
+ FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0"
+            VALUE "FileDescription", "@PACKAGE@ dissector\0"
+            VALUE "FileVersion", "@MODULE_VERSION@\0"
+            VALUE "InternalName", "@PACKAGE@ @MODULE_VERSION@\0"
+            VALUE "LegalCopyright", "Copyright © 1998 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
+            VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
+            VALUE "ProductName", "Wireshark\0"
+            VALUE "ProductVersion", "@VERSION@\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END