diff options
| author | Ron Yorston <rmy@pobox.com> | 2018-07-24 15:42:08 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2018-07-24 15:42:08 +0100 |
| commit | 2d0cdc18eca3d8a0d6732d239145c233bd93bf08 (patch) | |
| tree | ae9e444aea0dc7b94268b4e68f1de3a3d248a4a1 | |
| parent | 2ed6dd86c4515f49a528d3991c7ae504744bb28b (diff) | |
| download | busybox-w32-2d0cdc18eca3d8a0d6732d239145c233bd93bf08.tar.gz busybox-w32-2d0cdc18eca3d8a0d6732d239145c233bd93bf08.tar.bz2 busybox-w32-2d0cdc18eca3d8a0d6732d239145c233bd93bf08.zip | |
win32: tweaks to manifest
- Use CRLF line endings in manifest file.
- Add '-b' option to sed command to insert version in manifest file.
| -rw-r--r-- | win32/icon/Kbuild.src | 2 | ||||
| -rw-r--r-- | win32/icon/busybox-w32.manifest.src | 50 |
2 files changed, 26 insertions, 26 deletions
diff --git a/win32/icon/Kbuild.src b/win32/icon/Kbuild.src index a12f22fd7..b9c322529 100644 --- a/win32/icon/Kbuild.src +++ b/win32/icon/Kbuild.src | |||
| @@ -27,4 +27,4 @@ win32/icon/icon.o: win32/icon/aterm.ico win32/icon/sterm.ico | |||
| 27 | win32/icon/icon.o: win32/icon/busybox-w32.manifest | 27 | win32/icon/icon.o: win32/icon/busybox-w32.manifest |
| 28 | 28 | ||
| 29 | win32/icon/busybox-w32.manifest: win32/icon/busybox-w32.manifest.src .config | 29 | win32/icon/busybox-w32.manifest: win32/icon/busybox-w32.manifest.src .config |
| 30 | @sed "s/VERSION/$(BB_VER)/" win32/icon/busybox-w32.manifest.src >win32/icon/busybox-w32.manifest | 30 | @sed -b "s/VERSION/$(BB_VER)/" win32/icon/busybox-w32.manifest.src >win32/icon/busybox-w32.manifest |
diff --git a/win32/icon/busybox-w32.manifest.src b/win32/icon/busybox-w32.manifest.src index a30873dfa..c75dbdb96 100644 --- a/win32/icon/busybox-w32.manifest.src +++ b/win32/icon/busybox-w32.manifest.src | |||
| @@ -1,25 +1,25 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | 1 | <?xml version="1.0" encoding="UTF-8" standalone="yes"?> |
| 2 | <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> | 2 | <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> |
| 3 | <assemblyIdentity type="win32" name="busybox-w32" version="VERSION" /> | 3 | <assemblyIdentity type="win32" name="busybox-w32" version="VERSION" /> |
| 4 | <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> | 4 | <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> |
| 5 | <security> | 5 | <security> |
| 6 | <requestedPrivileges> | 6 | <requestedPrivileges> |
| 7 | <requestedExecutionLevel level="asInvoker" uiAccess="false" /> | 7 | <requestedExecutionLevel level="asInvoker" uiAccess="false" /> |
| 8 | </requestedPrivileges> | 8 | </requestedPrivileges> |
| 9 | </security> | 9 | </security> |
| 10 | </trustInfo> | 10 | </trustInfo> |
| 11 | <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> | 11 | <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> |
| 12 | <application> | 12 | <application> |
| 13 | <!-- Windows Vista --> | 13 | <!-- Windows Vista --> |
| 14 | <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> | 14 | <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> |
| 15 | <!-- Windows 7 --> | 15 | <!-- Windows 7 --> |
| 16 | <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> | 16 | <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> |
| 17 | <!-- Windows 8 --> | 17 | <!-- Windows 8 --> |
| 18 | <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> | 18 | <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> |
| 19 | <!-- Windows 8.1 --> | 19 | <!-- Windows 8.1 --> |
| 20 | <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> | 20 | <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> |
| 21 | <!-- Windows 10 --> | 21 | <!-- Windows 10 --> |
| 22 | <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> | 22 | <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> |
| 23 | </application> | 23 | </application> |
| 24 | </compatibility> | 24 | </compatibility> |
| 25 | </assembly> | 25 | </assembly> |