From ea172cdb15ba9780da806b5190c9dbb0a74231bd Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Sun, 23 Jul 2017 03:07:03 +0200
Subject: cmake: Add 'dist' target to create Windows .msi installer

- 'dist-win-msi' allows to create a Windows .msi installer using WiX
- 'dist-win-msi-fast' has a no compression but is much faster
  and can be used for testing purposes
---
 packaging/wix/files.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'packaging')

diff --git a/packaging/wix/files.py b/packaging/wix/files.py
index 70e5f29c0..dd5d72381 100755
--- a/packaging/wix/files.py
+++ b/packaging/wix/files.py
@@ -40,16 +40,17 @@ def directory(root, breadcrumb, level, exclude=[]):
 	files = [ f for f in os.listdir(root) if os.path.isfile(os.path.join(root,f)) and f not in exclude]
 	for file in files:
 		file_key = os.path.join(root, file)
+		file_key = file_key.replace('/', '\\')  # for usage from MSYS2 shell
 		_id = '_%06d' % (len(file_ids.keys()) + 1)
 		file_ids[file_key] = 'component' + _id
 		wxs.write(indent(level)+ "<Component Id='component" + _id + "' Guid='" + str(uuid.uuid4()) + "' DiskId='1' Win64='$(var.Win64)'>\n")
 		if file == 'inkscape.exe':
-			# we refenrence inkscape.exe in inkscape.wxs
+			# we reference inkscape.exe in inkscape.wxs
 			_id = '_inkscape_exe'
 		wxs.write(indent(level + 1)+ "<File Id='file" + _id + "' Name='" + file + "' DiskId='1' Source='" + file_key + "' KeyPath='yes' />\n")
 		wxs.write(indent(level)+ "</Component>\n")
-	# then all directories
 
+	# then all directories
 	dirs = [ f for f in os.listdir(root) if os.path.isdir(os.path.join(root,f)) ]
 	for dir in dirs:
 		directory_key = breadcrumb + '__' + dir
-- 
cgit v1.2.3