summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorEduard Braun <eduard.braun2@gmx.de>2017-07-23 01:07:03 +0000
committerEduard Braun <eduard.braun2@gmx.de>2017-07-23 01:49:14 +0000
commitea172cdb15ba9780da806b5190c9dbb0a74231bd (patch)
tree1e762af06944c9eaa3619f21de96515617081964 /packaging
parentcmake: Add 'dist' target to create Windows .exe installer (diff)
downloadinkscape-ea172cdb15ba9780da806b5190c9dbb0a74231bd.tar.gz
inkscape-ea172cdb15ba9780da806b5190c9dbb0a74231bd.zip
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
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/wix/files.py5
1 files changed, 3 insertions, 2 deletions
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