From 958ba292aab941d81b4d89dedc92ba78ace6b1ad Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Tue, 24 Jul 2018 16:43:10 +0100 Subject: win32: rename resource files Since more than just icon resources are now provided give various files more appropriate names. --- .gitignore | 1 + Makefile | 2 +- win32/icon/COPYING_CCBYSA3 | 7 ------ win32/icon/Kbuild.src | 30 ------------------------ win32/icon/README | 9 -------- win32/icon/aterm.ico | Bin 15086 -> 0 bytes win32/icon/busybox-w32.manifest.src | 25 -------------------- win32/icon/dummy.c | 0 win32/icon/icon.rc | 38 ------------------------------- win32/icon/sterm.ico | Bin 15086 -> 0 bytes win32/resources/COPYING_CCBYSA3 | 7 ++++++ win32/resources/Kbuild.src | 30 ++++++++++++++++++++++++ win32/resources/README | 9 ++++++++ win32/resources/aterm.ico | Bin 0 -> 15086 bytes win32/resources/busybox-w32.manifest.src | 25 ++++++++++++++++++++ win32/resources/dummy.c | 0 win32/resources/resources.rc | 38 +++++++++++++++++++++++++++++++ win32/resources/sterm.ico | Bin 0 -> 15086 bytes 18 files changed, 111 insertions(+), 110 deletions(-) delete mode 100644 win32/icon/COPYING_CCBYSA3 delete mode 100644 win32/icon/Kbuild.src delete mode 100644 win32/icon/README delete mode 100644 win32/icon/aterm.ico delete mode 100644 win32/icon/busybox-w32.manifest.src delete mode 100644 win32/icon/dummy.c delete mode 100644 win32/icon/icon.rc delete mode 100644 win32/icon/sterm.ico create mode 100644 win32/resources/COPYING_CCBYSA3 create mode 100644 win32/resources/Kbuild.src create mode 100644 win32/resources/README create mode 100644 win32/resources/aterm.ico create mode 100644 win32/resources/busybox-w32.manifest.src create mode 100644 win32/resources/dummy.c create mode 100644 win32/resources/resources.rc create mode 100644 win32/resources/sterm.ico diff --git a/.gitignore b/.gitignore index 2a7f2f79b..eeb5c2182 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ Config.in /busybox.exe /busybox_old /busybox_unstripped* +win32/resources/busybox-w32.manifest # # Backups / patches diff --git a/Makefile b/Makefile index dfab2e914..ee30c1f08 100644 --- a/Makefile +++ b/Makefile @@ -464,7 +464,7 @@ scripts_basic: include/autoconf.h # Objects we will link into busybox / subdirs we need to visit core-y := \ applets/ \ - win32/icon/ \ + win32/resources/ \ libs-y := \ archival/ \ diff --git a/win32/icon/COPYING_CCBYSA3 b/win32/icon/COPYING_CCBYSA3 deleted file mode 100644 index fc45d7818..000000000 --- a/win32/icon/COPYING_CCBYSA3 +++ /dev/null @@ -1,7 +0,0 @@ -This work is licenced under the Creative Commons Attribution-Share Alike 3.0 -United States License. To view a copy of this licence, visit -http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative -Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA. - -When attributing the artwork, using "GNOME Project" is enough. -Please link to http://www.gnome.org where available. diff --git a/win32/icon/Kbuild.src b/win32/icon/Kbuild.src deleted file mode 100644 index 15e59e474..000000000 --- a/win32/icon/Kbuild.src +++ /dev/null @@ -1,30 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 2018 by R M Yorston -# -# Licensed under GPLv2, see file LICENSE in this source tree. - -obj-y := - -obj-$(CONFIG_FEATURE_RESOURCES) += 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) $(WRFLAGS) $< $@ - -%.o: %.rc FORCE - $(call if_changed,windres) - -win32/icon/icon.o: win32/icon/icon.rc .config -win32/icon/icon.o: win32/icon/aterm.ico win32/icon/sterm.ico -win32/icon/icon.o: win32/icon/busybox-w32.manifest - -win32/icon/busybox-w32.manifest: win32/icon/busybox-w32.manifest.src .config - @sed -b "s/VERSION/$(BB_VER)/" win32/icon/busybox-w32.manifest.src >win32/icon/busybox-w32.manifest diff --git a/win32/icon/README b/win32/icon/README deleted file mode 100644 index 33a245386..000000000 --- a/win32/icon/README +++ /dev/null @@ -1,9 +0,0 @@ -The icons are based on those for GNOME terminal in the Adwaita theme. - -They were generated by importing the 16x16, 32x32 and 48x48 PNG files -into GIMP as separate layers then exporting as a single .ico file. - -The original files are dual-licensed under either the GNU LGPL v3 or -Creative Commons Attribution-Share Alike 3.0 United States License. - -The .ico files are licensed under the latter. diff --git a/win32/icon/aterm.ico b/win32/icon/aterm.ico deleted file mode 100644 index e680216a2..000000000 Binary files a/win32/icon/aterm.ico and /dev/null differ diff --git a/win32/icon/busybox-w32.manifest.src b/win32/icon/busybox-w32.manifest.src deleted file mode 100644 index c75dbdb96..000000000 --- a/win32/icon/busybox-w32.manifest.src +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/icon/dummy.c b/win32/icon/dummy.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/win32/icon/icon.rc b/win32/icon/icon.rc deleted file mode 100644 index 891f8a485..000000000 --- a/win32/icon/icon.rc +++ /dev/null @@ -1,38 +0,0 @@ -#include "../../include/autoconf.h" - -#if ENABLE_FEATURE_ICON_ATERM || ENABLE_FEATURE_ICON_ALL -1 ICON "aterm.ico" -#endif -#if ENABLE_FEATURE_ICON_STERM || ENABLE_FEATURE_ICON_ALL -2 ICON "sterm.ico" -#endif - -#if ENABLE_FEATURE_VERSIONINFO -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 -#endif - -#if ENABLE_FEATURE_MANIFEST -1 RT_MANIFEST "busybox-w32.manifest" -#endif diff --git a/win32/icon/sterm.ico b/win32/icon/sterm.ico deleted file mode 100644 index b9125b34d..000000000 Binary files a/win32/icon/sterm.ico and /dev/null differ diff --git a/win32/resources/COPYING_CCBYSA3 b/win32/resources/COPYING_CCBYSA3 new file mode 100644 index 000000000..fc45d7818 --- /dev/null +++ b/win32/resources/COPYING_CCBYSA3 @@ -0,0 +1,7 @@ +This work is licenced under the Creative Commons Attribution-Share Alike 3.0 +United States License. To view a copy of this licence, visit +http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative +Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA. + +When attributing the artwork, using "GNOME Project" is enough. +Please link to http://www.gnome.org where available. diff --git a/win32/resources/Kbuild.src b/win32/resources/Kbuild.src new file mode 100644 index 000000000..73fbfb7c7 --- /dev/null +++ b/win32/resources/Kbuild.src @@ -0,0 +1,30 @@ +# Makefile for busybox +# +# Copyright (C) 2018 by R M Yorston +# +# Licensed under GPLv2, see file LICENSE in this source tree. + +obj-y := + +obj-$(CONFIG_FEATURE_RESOURCES) += resources.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) $(WRFLAGS) $< $@ + +%.o: %.rc FORCE + $(call if_changed,windres) + +win32/resources/resources.o: win32/resources/resources.rc .config +win32/resources/resources.o: win32/resources/aterm.ico win32/resources/sterm.ico +win32/resources/resources.o: win32/resources/busybox-w32.manifest + +win32/resources/busybox-w32.manifest: win32/resources/busybox-w32.manifest.src .config + @sed -b "s/VERSION/$(BB_VER)/" win32/resources/busybox-w32.manifest.src >win32/resources/busybox-w32.manifest diff --git a/win32/resources/README b/win32/resources/README new file mode 100644 index 000000000..33a245386 --- /dev/null +++ b/win32/resources/README @@ -0,0 +1,9 @@ +The icons are based on those for GNOME terminal in the Adwaita theme. + +They were generated by importing the 16x16, 32x32 and 48x48 PNG files +into GIMP as separate layers then exporting as a single .ico file. + +The original files are dual-licensed under either the GNU LGPL v3 or +Creative Commons Attribution-Share Alike 3.0 United States License. + +The .ico files are licensed under the latter. diff --git a/win32/resources/aterm.ico b/win32/resources/aterm.ico new file mode 100644 index 000000000..e680216a2 Binary files /dev/null and b/win32/resources/aterm.ico differ diff --git a/win32/resources/busybox-w32.manifest.src b/win32/resources/busybox-w32.manifest.src new file mode 100644 index 000000000..c75dbdb96 --- /dev/null +++ b/win32/resources/busybox-w32.manifest.src @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win32/resources/dummy.c b/win32/resources/dummy.c new file mode 100644 index 000000000..e69de29bb diff --git a/win32/resources/resources.rc b/win32/resources/resources.rc new file mode 100644 index 000000000..891f8a485 --- /dev/null +++ b/win32/resources/resources.rc @@ -0,0 +1,38 @@ +#include "../../include/autoconf.h" + +#if ENABLE_FEATURE_ICON_ATERM || ENABLE_FEATURE_ICON_ALL +1 ICON "aterm.ico" +#endif +#if ENABLE_FEATURE_ICON_STERM || ENABLE_FEATURE_ICON_ALL +2 ICON "sterm.ico" +#endif + +#if ENABLE_FEATURE_VERSIONINFO +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 +#endif + +#if ENABLE_FEATURE_MANIFEST +1 RT_MANIFEST "busybox-w32.manifest" +#endif diff --git a/win32/resources/sterm.ico b/win32/resources/sterm.ico new file mode 100644 index 000000000..b9125b34d Binary files /dev/null and b/win32/resources/sterm.ico differ -- cgit v1.2.3-55-g6feb