From 9348221cef7762c2f5814f50b18c6a79701f5cda Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Wed, 28 Mar 2018 11:51:27 +0100 Subject: Add a VERSIONINFO resource to the binary If icons are enabled we might as well store some version information. The string manipulation is based on this: https://stackoverflow.com/questions/8540485/how-do-i-split-a-string-in-make Closes issue #108. --- win32/icon/Kbuild.src | 12 ++++++++++-- win32/icon/icon.rc | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/win32/icon/Kbuild.src b/win32/icon/Kbuild.src index bde74091f..d9087172c 100644 --- a/win32/icon/Kbuild.src +++ b/win32/icon/Kbuild.src @@ -8,8 +8,16 @@ obj-y := obj-$(CONFIG_FEATURE_ICON) += icon.o +# return commit level if available or 0 +bb_level = $(or $(word 2,$(subst -, ,$1)),0) + +WRFLAGS := -D"KBUILD_STR(s)=\#s" -D"BB_VER=KBUILD_STR($(BB_VER))" \ + -D"BB_VERSION=$(VERSION)" -D"BB_PATCHLEVEL=$(PATCHLEVEL)" \ + -D"BB_SUBLEVEL=$(SUBLEVEL)" \ + -D"BB_EXTRAVERSION=$(call bb_level,$(EXTRAVERSION))" + quiet_cmd_windres = WINDRES $@ - cmd_windres = $(WINDRES) $< $@ + cmd_windres = $(WINDRES) $(WRFLAGS) $< $@ -win32/icon/icon.o: win32/icon/icon.rc .config +win32/icon/icon.o: win32/icon/icon.rc .config .kernelrelease $(call cmd,windres) diff --git a/win32/icon/icon.rc b/win32/icon/icon.rc index d91c4a482..cdd399957 100644 --- a/win32/icon/icon.rc +++ b/win32/icon/icon.rc @@ -6,3 +6,27 @@ #if CONFIG_FEATURE_ICON_STERM || CONFIG_FEATURE_ICON_ALL 2 ICON "sterm.ico" #endif + +1 VERSIONINFO +FILEVERSION BB_VERSION,BB_PATCHLEVEL,BB_SUBLEVEL,BB_EXTRAVERSION +PRODUCTVERSION BB_VERSION,BB_PATCHLEVEL,BB_SUBLEVEL,BB_EXTRAVERSION +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "080904E4" + BEGIN + VALUE "CompanyName", "frippery.org" + VALUE "FileDescription", "BusyBox multi-call binary" + VALUE "FileVersion", BB_VER + VALUE "InternalName", "busybox" + VALUE "LegalCopyright", "(C) 1998-2018 Many authors" + VALUE "OriginalFilename", "busybox.exe" + VALUE "ProductName", "busybox-w32" + VALUE "ProductVersion", BB_VER + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x809, 1252 + END +END -- cgit v1.2.3-55-g6feb