From e9b1042c25391d27d80ab2a12431a57c5391b08f Mon Sep 17 00:00:00 2001 From: UK992 Date: Fri, 9 Dec 2016 18:08:07 +0100 Subject: [PATCH] Fix WiX installer and shorten ids --- support/windows/Servo.wxs.mako | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/support/windows/Servo.wxs.mako b/support/windows/Servo.wxs.mako index a4b58892eef..a1b8d8ffa41 100644 --- a/support/windows/Servo.wxs.mako +++ b/support/windows/Servo.wxs.mako @@ -153,7 +153,10 @@ import re import uuid def make_id(s): - return "Id{}".format(s.replace("-", "_").replace("/", "_")) + s = s.replace(os.getcwd(), "").replace("-", "_").replace("/", "_").replace("\\", "_") + if "browserhtml" in s: + s = "browserhtml_" + s[s.index("out") + 4:] + return "Id{}".format(s) def listfiles(directory): return [f for f in os.listdir(directory)