From 2d0cdc18eca3d8a0d6732d239145c233bd93bf08 Mon Sep 17 00:00:00 2001
From: Ron Yorston <rmy@pobox.com>
Date: Tue, 24 Jul 2018 15:42:08 +0100
Subject: win32: tweaks to manifest

- Use CRLF line endings in manifest file.

- Add '-b' option to sed command to insert version in manifest file.
---
 win32/icon/Kbuild.src               |  2 +-
 win32/icon/busybox-w32.manifest.src | 50 ++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'win32')

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
 win32/icon/icon.o: win32/icon/busybox-w32.manifest
 
 win32/icon/busybox-w32.manifest: win32/icon/busybox-w32.manifest.src .config
-	@sed "s/VERSION/$(BB_VER)/" win32/icon/busybox-w32.manifest.src >win32/icon/busybox-w32.manifest
+	@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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity type="win32" name="busybox-w32" version="VERSION" />
-	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-		<security>
-			<requestedPrivileges>
-				<requestedExecutionLevel level="asInvoker" uiAccess="false" />
-			</requestedPrivileges>
-		</security>
-	</trustInfo>
-	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-		<application>
-			<!-- Windows Vista -->
-			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-			<!-- Windows 7 -->
-			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-			<!-- Windows 8 -->
-			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-			<!-- Windows 8.1 -->
-			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-			<!-- Windows 10 -->
-			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-		</application>
-	</compatibility>
-</assembly>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity type="win32" name="busybox-w32" version="VERSION" />
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="asInvoker" uiAccess="false" />
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+		<application>
+			<!-- Windows Vista -->
+			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+			<!-- Windows 7 -->
+			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+			<!-- Windows 8 -->
+			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+			<!-- Windows 8.1 -->
+			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+			<!-- Windows 10 -->
+			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+		</application>
+	</compatibility>
+</assembly>
-- 
cgit v1.2.3-55-g6feb