aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViktor Szakats <commit@vsz.me>2025-11-04 20:48:00 +0100
committerRon Yorston <rmy@pobox.com>2025-11-06 10:50:37 +0000
commite7f23eb454b1ad6f013b69f93276a39c3da3bb4d (patch)
tree25441953d62b66b369be488f5b8a8cab60fa97a0
parent84dd08634017588e3019268a008141a859017fbe (diff)
downloadbusybox-w32-e7f23eb454b1ad6f013b69f93276a39c3da3bb4d.tar.gz
busybox-w32-e7f23eb454b1ad6f013b69f93276a39c3da3bb4d.tar.bz2
busybox-w32-e7f23eb454b1ad6f013b69f93276a39c3da3bb4d.zip
manifest: integrate into resources.rc, reduce binary size
It also makes the version number within the manifest use the version macros, replacing the hard-coded "6.0.0.0". Unicode: 32668 -> 32188 (-480 bytes) non-Unicode: 32412 -> 31956 (-456 bytes) with icons included.
Diffstat
-rw-r--r--win32/resources/Kbuild.src2
-rw-r--r--win32/resources/app.manifest24
-rw-r--r--win32/resources/resources.rc52
-rw-r--r--win32/resources/utf8.manifest30
4 files changed, 50 insertions, 58 deletions
diff --git a/win32/resources/Kbuild.src b/win32/resources/Kbuild.src
index d056a5964..4f148c78f 100644
--- a/win32/resources/Kbuild.src
+++ b/win32/resources/Kbuild.src
@@ -25,5 +25,3 @@ quiet_cmd_windres = WINDRES $@
25 25
26win32/resources/resources.o: win32/resources/resources.rc .config 26win32/resources/resources.o: win32/resources/resources.rc .config
27win32/resources/resources.o: win32/resources/aterm.ico win32/resources/sterm.ico 27win32/resources/resources.o: win32/resources/aterm.ico win32/resources/sterm.ico
28win32/resources/resources.o: win32/resources/utf8.manifest
29win32/resources/resources.o: win32/resources/app.manifest
diff --git a/win32/resources/app.manifest b/win32/resources/app.manifest
deleted file mode 100644
index 5e76b7b8e..000000000
--- a/win32/resources/app.manifest
+++ /dev/null
@@ -1,24 +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 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
4 <security>
5 <requestedPrivileges>
6 <requestedExecutionLevel level="asInvoker"/>
7 </requestedPrivileges>
8 </security>
9 </trustInfo>
10 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
11 <application>
12 <!--The ID below indicates application support for Windows Vista -->
13 <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
14 <!--The ID below indicates application support for Windows 7 -->
15 <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
16 <!--The ID below indicates application support for Windows 8 -->
17 <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
18 <!--The ID below indicates application support for Windows 8.1 -->
19 <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
20 <!--The ID below indicates application support for Windows 10 -->
21 <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
22 </application>
23 </compatibility>
24</assembly>
diff --git a/win32/resources/resources.rc b/win32/resources/resources.rc
index 5d06dda3c..1a3921223 100644
--- a/win32/resources/resources.rc
+++ b/win32/resources/resources.rc
@@ -37,9 +37,57 @@ END
37 37
38/* Hardcode numeric value for MANIFEST for llvm windres */ 38/* Hardcode numeric value for MANIFEST for llvm windres */
39#if ENABLE_FEATURE_UTF8_MANIFEST 39#if ENABLE_FEATURE_UTF8_MANIFEST
401 24 "utf8.manifest" 401 24
41BEGIN
42 "<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>"
43 "<assembly manifestVersion=""1.0"" xmlns=""urn:schemas-microsoft-com:asm.v1"">"
44 "<assemblyIdentity type=""win32"" name=""busybox.exe"" version=""" xstr(BB_VERSION) "." xstr(BB_PATCHLEVEL) "." xstr(BB_SUBLEVEL) "." xstr(BB_EXTRAVERSION) """/>"
45 "<application>"
46 "<windowsSettings>"
47 "<activeCodePage xmlns=""http://schemas.microsoft.com/SMI/2019/WindowsSettings"">UTF-8</activeCodePage>"
48 "</windowsSettings>"
49 "</application>"
50 "<trustInfo xmlns=""urn:schemas-microsoft-com:asm.v3"">"
51 "<security>"
52 "<requestedPrivileges>"
53 "<requestedExecutionLevel level=""asInvoker""/>"
54 "</requestedPrivileges>"
55 "</security>"
56 "</trustInfo>"
57 "<compatibility xmlns=""urn:schemas-microsoft-com:compatibility.v1"">"
58 "<application>"
59 "<supportedOS Id=""{e2011457-1546-43c5-a5fe-008deee3d3f0}""/>" /* Application support for Windows Vista */
60 "<supportedOS Id=""{35138b9a-5d96-4fbd-8e2d-a2440225f93a}""/>" /* Application support for Windows 7 */
61 "<supportedOS Id=""{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}""/>" /* Application support for Windows 8 */
62 "<supportedOS Id=""{1f676c76-80e1-4239-95bb-83d0f6d0da78}""/>" /* Application support for Windows 8.1 */
63 "<supportedOS Id=""{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}""/>" /* Application support for Windows 10 */
64 "</application>"
65 "</compatibility>"
66 "</assembly>"
67END
41#endif 68#endif
42 69
43#if ENABLE_FEATURE_APP_MANIFEST 70#if ENABLE_FEATURE_APP_MANIFEST
441 24 "app.manifest" 711 24
72BEGIN
73 "<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>"
74 "<assembly xmlns=""urn:schemas-microsoft-com:asm.v1"" manifestVersion=""1.0"">"
75 "<trustInfo xmlns=""urn:schemas-microsoft-com:asm.v3"">"
76 "<security>"
77 "<requestedPrivileges>"
78 "<requestedExecutionLevel level=""asInvoker""/>"
79 "</requestedPrivileges>"
80 "</security>"
81 "</trustInfo>"
82 "<compatibility xmlns=""urn:schemas-microsoft-com:compatibility.v1"">"
83 "<application>"
84 "<supportedOS Id=""{e2011457-1546-43c5-a5fe-008deee3d3f0}""/>" /* Application support for Windows Vista */
85 "<supportedOS Id=""{35138b9a-5d96-4fbd-8e2d-a2440225f93a}""/>" /* Application support for Windows 7 */
86 "<supportedOS Id=""{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}""/>" /* Application support for Windows 8 */
87 "<supportedOS Id=""{1f676c76-80e1-4239-95bb-83d0f6d0da78}""/>" /* Application support for Windows 8.1 */
88 "<supportedOS Id=""{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}""/>" /* Application support for Windows 10 */
89 "</application>"
90 "</compatibility>"
91 "</assembly>"
92END
45#endif 93#endif
diff --git a/win32/resources/utf8.manifest b/win32/resources/utf8.manifest
deleted file mode 100644
index efe6a3d2f..000000000
--- a/win32/resources/utf8.manifest
+++ /dev/null
@@ -1,30 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3 <assemblyIdentity type="win32" name="busybox.exe" version="6.0.0.0"/>
4 <application>
5 <windowsSettings>
6 <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
7 </windowsSettings>
8 </application>
9 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
10 <security>
11 <requestedPrivileges>
12 <requestedExecutionLevel level="asInvoker"/>
13 </requestedPrivileges>
14 </security>
15 </trustInfo>
16 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
17 <application>
18 <!--The ID below indicates application support for Windows Vista -->
19 <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
20 <!--The ID below indicates application support for Windows 7 -->
21 <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
22 <!--The ID below indicates application support for Windows 8 -->
23 <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
24 <!--The ID below indicates application support for Windows 8.1 -->
25 <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
26 <!--The ID below indicates application support for Windows 10 -->
27 <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
28 </application>
29 </compatibility>
30</assembly>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-11-23 07:09:34 +0000