diff options
author | jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-12-04 23:12:04 +0000 |
---|---|---|
committer | jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-12-04 23:12:04 +0000 |
commit | 26e714ad474999f4a62000ba4850058831de850a (patch) | |
tree | 13669fcc2915c8f7ee0c9da6217b9492810ca5f0 | |
parent | 1c854c2337e164440569a018d0dc735dbc15b9ec (diff) |
This is to test the waters.
I've added a version resource to the h223 Wireshark plugin as Win32 DLL, setting a possible example for other plugins.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20036 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | plugins/h223/Makefile.nmake | 25 | ||||
-rw-r--r-- | plugins/h223/moduleinfo.nmake | 28 | ||||
-rw-r--r-- | plugins/h223/plugin.rc.in | 33 |
3 files changed, 78 insertions, 8 deletions
diff --git a/plugins/h223/Makefile.nmake b/plugins/h223/Makefile.nmake index 555ba3b928..716b2a445e 100644 --- a/plugins/h223/Makefile.nmake +++ b/plugins/h223/Makefile.nmake @@ -1,12 +1,11 @@ # Makefile.nmake -# nmake file for H.223 plugin +# nmake file for Wireshark plugin # # $Id$ # include ..\..\config.nmake - -############### no need to modify below this line ######### +include moduleinfo.nmake include Makefile.common @@ -25,10 +24,20 @@ DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) OBJECTS = $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) plugin.obj -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) \ - $(LINK_PLUGIN_WITH) $(GLIB_LIBS) +RESOURCE=$(PLUGIN_NAME).res + +$(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 @@ -65,7 +74,7 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU plugin.c: $(DISSECTOR_SRC) !IFDEF PYTHON @echo Making plugin.c (using python) - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(DISSECTOR_SRC) + @$(PYTHON) ../../tools/make-dissector-reg.py . plugin $(DISSECTOR_SRC) !ELSE @echo Making plugin.c (using sh) @$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC) @@ -75,7 +84,7 @@ plugin.c: $(DISSECTOR_SRC) clean: rm -f $(OBJECTS) $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp \ - $(PLUGIN_NAME).lib *.pdb + $(RESOURCE) $(PLUGIN_NAME).rc $(PLUGIN_NAME).lib *.pdb distclean: clean diff --git a/plugins/h223/moduleinfo.nmake b/plugins/h223/moduleinfo.nmake new file mode 100644 index 0000000000..2b9908aeb6 --- /dev/null +++ b/plugins/h223/moduleinfo.nmake @@ -0,0 +1,28 @@ +# +# $Id$ +# + +# The name +PACKAGE=h223 + +# 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/h223/plugin.rc.in b/plugins/h223/plugin.rc.in new file mode 100644 index 0000000000..e394a4fd40 --- /dev/null +++ b/plugins/h223/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 |