windows: Put name and version information into lspci/setpci executables

Extend existing .in resource template file and generate resource objects
also for lspci.exe and setpci.exe executables.

diff --git a/Makefile b/Makefile
index e2e3bd7ee74d92f46e9a26a7ee0f7cde6fe4492c..11f15f19f2e7ab61fc51dccaba57f5c718f93136 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -112,6 +112,21 @@ example.o: example.c $(PCIINC)
 %$(EXEEXT): %.o
        $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@
 
+ifdef PCI_OS_WINDOWS
+comma := ,
+%-rsrc.rc: lib/winrsrc.rc.in
+       sed <$< >$@ -e 's,@PCILIB_VERSION@,$(PCILIB_VERSION),' \
+               -e 's,@PCILIB_VERSION_WINRC@,$(subst .,\$(comma),$(PCILIB_VERSION).0),' \
+               -e 's,@FILENAME@,$(subst -rsrc.rc,$(EXEEXT),$@),' \
+               -e 's,@DESCRIPTION@,$(subst -rsrc.rc,,$@),' \
+               -e 's,@LIBRARY_BUILD@,0,' \
+               -e 's,@DEBUG_BUILD@,$(if $(findstring -g,$(CFLAGS)),1,0),'
+%-rsrc.o: %-rsrc.rc
+       $(WINDRES) --input=$< --output=$@ --input-format=rc --output-format=coff
+lspci$(EXEEXT): lspci-rsrc.o
+setpci$(EXEEXT): setpci-rsrc.o
+endif
+
 %.8 %.7 %.5: %.man
        M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#;s#@PCI_IDS@#$(PCI_IDS)#"
 
@@ -125,7 +140,7 @@ TAGS:
 
 clean:
        rm -f `find . -name "*~" -o -name "*.[oa]" -o -name "\#*\#" -o -name TAGS -o -name core -o -name "*.orig"`
-       rm -f update-pciids lspci$(EXEEXT) setpci$(EXEEXT) example$(EXEEXT) lib/config.* *.[578] pci.ids.gz lib/*.pc lib/*.so lib/*.so.* lib/*.dll lib/*.def lib/dllrsrc.rc tags
+       rm -f update-pciids lspci$(EXEEXT) setpci$(EXEEXT) example$(EXEEXT) lib/config.* *.[578] pci.ids.gz lib/*.pc lib/*.so lib/*.so.* lib/*.dll lib/*.def lib/dllrsrc.rc *-rsrc.rc tags
        rm -rf maint/dist
 
 distclean: clean

diff --git a/lib/Makefile b/lib/Makefile
index 13c2a1950ac7e93638eff671f4abb48785806f27..05db1ecd3a2f359411345b2ec4467d7f0640c74b 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -79,10 +79,12 @@ $(PCIIMPDEF): libpci.ver ver2def.pl
 $(PCIIMPLIB): $(PCIIMPDEF)
        $(DLLTOOL) --input-def $< --output-lib $@
 comma := ,
-dllrsrc.rc: dllrsrc.rc.in
+dllrsrc.rc: winrsrc.rc.in
        sed <$< >$@ -e 's,@PCILIB_VERSION@,$(PCILIB_VERSION),' \
                -e 's,@PCILIB_VERSION_WINRC@,$(subst .,\$(comma),$(PCILIB_VERSION).0),' \
-               -e 's,@PCILIB@,$(PCILIB),' \
+               -e 's,@FILENAME@,$(PCILIB),' \
+               -e 's,@DESCRIPTION@,libpci,' \
+               -e 's,@LIBRARY_BUILD@,1,' \
                -e 's,@DEBUG_BUILD@,$(if $(findstring -g,$(CFLAGS)),1,0),'
 dllrsrc.o: dllrsrc.rc
        $(WINDRES) --input=$< --output=$@ --input-format=rc --output-format=coff

diff --git a/lib/dllrsrc.rc.in b/lib/dllrsrc.rc.in
deleted file mode 100644 (file)
index 519772b..0000000
--- a/lib/dllrsrc.rc.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <windows.h>
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION @PCILIB_VERSION_WINRC@
-PRODUCTVERSION @PCILIB_VERSION_WINRC@
-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#if @DEBUG_BUILD@
-FILEFLAGS VS_FF_DEBUG
-#else
-FILEFLAGS 0
-#endif
-FILEOS VOS_NT_WINDOWS32
-FILETYPE VFT_DLL
-FILESUBTYPE 0
-BEGIN
-       BLOCK "StringFileInfo"
-       BEGIN
-               /*
-                * GNU windres seems that converts 7-bit ASCII strings to UTF-16,
-                * so specify UNICODE/UTF-16 encoding (0x04B0) for these strings.
-                */
-               BLOCK "040904B0" /* Default U.S. English language, UNICODE/UTF-16 codepage */
-               BEGIN
-                       VALUE "FileDescription", "libpci"
-                       VALUE "FileVersion", "@PCILIB_VERSION@"
-                       VALUE "InternalName", "@PCILIB@"
-                       VALUE "OriginalFilename", "@PCILIB@"
-                       VALUE "ProductName", "pciutils"
-                       VALUE "ProductVersion", "@PCILIB_VERSION@"
-               END
-       END
-       BLOCK "VarFileInfo"
-       BEGIN
-               VALUE "Translation", 0x0409, 0x004B0 /* Default U.S. English language, UNICODE/UTF-16 codepage */
-       END
-END

diff --git a/lib/winrsrc.rc.in b/lib/winrsrc.rc.in
new file mode 100644 (file)
index 0000000..6f16dc2
--- /dev/null
+++ b/lib/winrsrc.rc.in
@@ -0,0 +1,39 @@
+#include <windows.h>
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION @PCILIB_VERSION_WINRC@
+PRODUCTVERSION @PCILIB_VERSION_WINRC@
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#if @DEBUG_BUILD@
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0
+#endif
+FILEOS VOS_NT_WINDOWS32
+#if @LIBRARY_BUILD@
+FILETYPE VFT_DLL
+#else
+FILETYPE VFT_APP
+#endif
+FILESUBTYPE 0
+BEGIN
+       BLOCK "StringFileInfo"
+       BEGIN
+               /*
+                * GNU windres seems that converts 7-bit ASCII strings to UTF-16,
+                * so specify UNICODE/UTF-16 encoding (0x04B0) for these strings.
+                */
+               BLOCK "040904B0" /* Default U.S. English language, UNICODE/UTF-16 codepage */
+               BEGIN
+                       VALUE "FileDescription", "@DESCRIPTION@"
+                       VALUE "FileVersion", "@PCILIB_VERSION@"
+                       VALUE "InternalName", "@FILENAME@"
+                       VALUE "OriginalFilename", "@FILENAME@"
+                       VALUE "ProductName", "pciutils"
+                       VALUE "ProductVersion", "@PCILIB_VERSION@"
+               END
+       END
+       BLOCK "VarFileInfo"
+       BEGIN
+               VALUE "Translation", 0x0409, 0x004B0 /* Default U.S. English language, UNICODE/UTF-16 codepage */
+       END
+END