diff options
author | Ron Yorston <rmy@pobox.com> | 2018-07-24 16:43:10 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2018-07-24 16:43:10 +0100 |
commit | 958ba292aab941d81b4d89dedc92ba78ace6b1ad (patch) | |
tree | f10caea34bb23a61be8de468a7e3f6fae16363bd /win32/icon | |
parent | 43dd125914c7cc4656cf06b23230031e3444c5ff (diff) | |
download | busybox-w32-958ba292aab941d81b4d89dedc92ba78ace6b1ad.tar.gz busybox-w32-958ba292aab941d81b4d89dedc92ba78ace6b1ad.tar.bz2 busybox-w32-958ba292aab941d81b4d89dedc92ba78ace6b1ad.zip |
win32: rename resource files
Since more than just icon resources are now provided give various
files more appropriate names.
Diffstat (limited to 'win32/icon')
-rw-r--r-- | win32/icon/COPYING_CCBYSA3 | 7 | ||||
-rw-r--r-- | win32/icon/Kbuild.src | 30 | ||||
-rw-r--r-- | win32/icon/README | 9 | ||||
-rw-r--r-- | win32/icon/aterm.ico | bin | 15086 -> 0 bytes | |||
-rw-r--r-- | win32/icon/busybox-w32.manifest.src | 25 | ||||
-rw-r--r-- | win32/icon/dummy.c | 0 | ||||
-rw-r--r-- | win32/icon/icon.rc | 38 | ||||
-rw-r--r-- | win32/icon/sterm.ico | bin | 15086 -> 0 bytes |
8 files changed, 0 insertions, 109 deletions
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 @@ | |||
1 | This work is licenced under the Creative Commons Attribution-Share Alike 3.0 | ||
2 | United States License. To view a copy of this licence, visit | ||
3 | http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative | ||
4 | Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA. | ||
5 | |||
6 | When attributing the artwork, using "GNOME Project" is enough. | ||
7 | 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 @@ | |||
1 | # Makefile for busybox | ||
2 | # | ||
3 | # Copyright (C) 2018 by R M Yorston <rmy@pobox.com> | ||
4 | # | ||
5 | # Licensed under GPLv2, see file LICENSE in this source tree. | ||
6 | |||
7 | obj-y := | ||
8 | |||
9 | obj-$(CONFIG_FEATURE_RESOURCES) += icon.o | ||
10 | |||
11 | # return commit level if available or 0 | ||
12 | bb_level = $(or $(word 2,$(subst -, ,$1)),0) | ||
13 | |||
14 | WRFLAGS := -D"KBUILD_STR(s)=\#s" -D"BB_VER=KBUILD_STR($(BB_VER))" \ | ||
15 | -D"BB_VERSION=$(VERSION)" -D"BB_PATCHLEVEL=$(PATCHLEVEL)" \ | ||
16 | -D"BB_SUBLEVEL=$(SUBLEVEL)" \ | ||
17 | -D"BB_EXTRAVERSION=$(call bb_level,$(EXTRAVERSION))" | ||
18 | |||
19 | quiet_cmd_windres = WINDRES $@ | ||
20 | cmd_windres = $(WINDRES) $(WRFLAGS) $< $@ | ||
21 | |||
22 | %.o: %.rc FORCE | ||
23 | $(call if_changed,windres) | ||
24 | |||
25 | win32/icon/icon.o: win32/icon/icon.rc .config | ||
26 | win32/icon/icon.o: win32/icon/aterm.ico win32/icon/sterm.ico | ||
27 | win32/icon/icon.o: win32/icon/busybox-w32.manifest | ||
28 | |||
29 | win32/icon/busybox-w32.manifest: win32/icon/busybox-w32.manifest.src .config | ||
30 | @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 @@ | |||
1 | The icons are based on those for GNOME terminal in the Adwaita theme. | ||
2 | |||
3 | They were generated by importing the 16x16, 32x32 and 48x48 PNG files | ||
4 | into GIMP as separate layers then exporting as a single .ico file. | ||
5 | |||
6 | The original files are dual-licensed under either the GNU LGPL v3 or | ||
7 | Creative Commons Attribution-Share Alike 3.0 United States License. | ||
8 | |||
9 | 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 --- a/win32/icon/aterm.ico +++ /dev/null | |||
Binary files 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 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | ||
2 | <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> | ||
3 | <assemblyIdentity type="win32" name="busybox-w32" version="VERSION" /> | ||
4 | <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> | ||
5 | <security> | ||
6 | <requestedPrivileges> | ||
7 | <requestedExecutionLevel level="asInvoker" uiAccess="false" /> | ||
8 | </requestedPrivileges> | ||
9 | </security> | ||
10 | </trustInfo> | ||
11 | <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> | ||
12 | <application> | ||
13 | <!-- Windows Vista --> | ||
14 | <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> | ||
15 | <!-- Windows 7 --> | ||
16 | <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> | ||
17 | <!-- Windows 8 --> | ||
18 | <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> | ||
19 | <!-- Windows 8.1 --> | ||
20 | <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> | ||
21 | <!-- Windows 10 --> | ||
22 | <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> | ||
23 | </application> | ||
24 | </compatibility> | ||
25 | </assembly> | ||
diff --git a/win32/icon/dummy.c b/win32/icon/dummy.c deleted file mode 100644 index e69de29bb..000000000 --- a/win32/icon/dummy.c +++ /dev/null | |||
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 @@ | |||
1 | #include "../../include/autoconf.h" | ||
2 | |||
3 | #if ENABLE_FEATURE_ICON_ATERM || ENABLE_FEATURE_ICON_ALL | ||
4 | 1 ICON "aterm.ico" | ||
5 | #endif | ||
6 | #if ENABLE_FEATURE_ICON_STERM || ENABLE_FEATURE_ICON_ALL | ||
7 | 2 ICON "sterm.ico" | ||
8 | #endif | ||
9 | |||
10 | #if ENABLE_FEATURE_VERSIONINFO | ||
11 | 1 VERSIONINFO | ||
12 | FILEVERSION BB_VERSION,BB_PATCHLEVEL,BB_SUBLEVEL,BB_EXTRAVERSION | ||
13 | PRODUCTVERSION BB_VERSION,BB_PATCHLEVEL,BB_SUBLEVEL,BB_EXTRAVERSION | ||
14 | BEGIN | ||
15 | BLOCK "StringFileInfo" | ||
16 | BEGIN | ||
17 | BLOCK "080904E4" | ||
18 | BEGIN | ||
19 | VALUE "CompanyName", "frippery.org" | ||
20 | VALUE "FileDescription", "BusyBox multi-call binary" | ||
21 | VALUE "FileVersion", BB_VER | ||
22 | VALUE "InternalName", "busybox" | ||
23 | VALUE "LegalCopyright", "(C) 1998-2018 Many authors" | ||
24 | VALUE "OriginalFilename", "busybox.exe" | ||
25 | VALUE "ProductName", "busybox-w32" | ||
26 | VALUE "ProductVersion", BB_VER | ||
27 | END | ||
28 | END | ||
29 | BLOCK "VarFileInfo" | ||
30 | BEGIN | ||
31 | VALUE "Translation", 0x809, 1252 | ||
32 | END | ||
33 | END | ||
34 | #endif | ||
35 | |||
36 | #if ENABLE_FEATURE_MANIFEST | ||
37 | 1 RT_MANIFEST "busybox-w32.manifest" | ||
38 | #endif | ||
diff --git a/win32/icon/sterm.ico b/win32/icon/sterm.ico deleted file mode 100644 index b9125b34d..000000000 --- a/win32/icon/sterm.ico +++ /dev/null | |||
Binary files differ | |||