From d8c0b87eb20f5c8e511ea920358d51c5199ccfab Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Thu, 30 Jun 2016 11:51:44 -0600
Subject: [PATCH] Add Windows packaging to create an MSI installer

---
 components/servo/.cargo/config   |   3 +
 components/servo/fake-ld.cmd     |   2 +
 etc/ci/upload_nightly.sh         |   4 +-
 python/servo/package_commands.py |  59 ++++++++-
 resources/Servo.ico              | Bin 0 -> 32988 bytes
 support/windows/Servo.wxs.mako   | 207 +++++++++++++++++++++++++++++++
 support/windows/fonts.conf       |  44 +++++++
 7 files changed, 312 insertions(+), 7 deletions(-)
 create mode 100644 components/servo/fake-ld.cmd
 create mode 100644 resources/Servo.ico
 create mode 100644 support/windows/Servo.wxs.mako
 create mode 100644 support/windows/fonts.conf

diff --git a/components/servo/.cargo/config b/components/servo/.cargo/config
index dffe440072c1..1cea095353fd 100644
--- a/components/servo/.cargo/config
+++ b/components/servo/.cargo/config
@@ -9,3 +9,6 @@ ar = "arm-linux-gnueabihf-ar"
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"
 ar = "aarch64-linux-gnu-ar"
+
+[target.'cfg(target_os=windows)']
+linker = "./fake-ld.cmd"
\ No newline at end of file
diff --git a/components/servo/fake-ld.cmd b/components/servo/fake-ld.cmd
new file mode 100644
index 000000000000..b13c7e818ab6
--- /dev/null
+++ b/components/servo/fake-ld.cmd
@@ -0,0 +1,2 @@
+@echo off
+gcc -mwindows %*
diff --git a/etc/ci/upload_nightly.sh b/etc/ci/upload_nightly.sh
index e3033cc0902e..dfde162e354c 100755
--- a/etc/ci/upload_nightly.sh
+++ b/etc/ci/upload_nightly.sh
@@ -41,8 +41,8 @@ main() {
         extension=dmg
         package=target/*."${extension}"
     elif [[ "${platform}" == "windows" ]]; then
-        extension=tar.gz
-        package=target/*."${extension}"
+        extension=msi
+        package=target/msi/*.msi
     else
         usage >&2
         return 1
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index d3d7877c674d..1bd91e6eae12 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -9,8 +9,11 @@
 
 from __future__ import print_function, unicode_literals
 
-import os
+import sys
 import os.path as path
+sys.path.append(path.join(path.dirname(sys.argv[0]), "components", "style", "properties", "Mako-0.9.1.zip"))
+
+import os
 import shutil
 import subprocess
 import tarfile
@@ -24,7 +27,9 @@
     Command,
 )
 
-from servo.command_base import CommandBase, cd, BuildNotFound, is_macosx
+from mako.template import Template
+
+from servo.command_base import CommandBase, cd, BuildNotFound, is_macosx, is_windows
 from servo.post_build_commands import find_dep_path_newest
 
 
@@ -42,6 +47,11 @@ def otool(s):
             yield l.split(' ', 1)[0][1:]
 
 
+def listfiles(directory):
+    return [f for f in os.listdir(directory)
+            if path.isfile(path.join(directory, f))]
+
+
 def install_name_tool(old, new, binary):
     try:
         subprocess.check_call(['install_name_tool', '-change', old, '@executable_path/' + new, binary])
@@ -76,7 +86,7 @@ def package(self, release=False, dev=False, android=None, debug=False, debugger=
                 env["ANT_FLAVOR"] = "release"
                 dev_flag = ""
 
-            target_dir = os.path.dirname(binary_path)
+            target_dir = path.dirname(binary_path)
             output_apk = "{}.apk".format(binary_path)
             try:
                 with cd(path.join("support", "android", "build-apk")):
@@ -91,7 +101,7 @@ def package(self, release=False, dev=False, android=None, debug=False, debugger=
             dir_to_app = dir_to_dmg + '/Servo.app'
             dir_to_resources = dir_to_app + '/Contents/Resources/'
             dir_to_root = '/'.join(binary_path.split('/')[:-3])
-            if os.path.exists(dir_to_dmg):
+            if path.exists(dir_to_dmg):
                 print("Cleaning up from previous packaging")
                 delete(dir_to_dmg)
             browserhtml_path = find_dep_path_newest('browserhtml', binary_path)
@@ -123,7 +133,7 @@ def package(self, release=False, dev=False, android=None, debug=False, debugger=
                         continue
                     need_relinked = set(otool(f))
                     new_path = dir_to_app + '/Contents/MacOS/' + f.split('/')[-1]
-                    if not os.path.exists(new_path):
+                    if not path.exists(new_path):
                         shutil.copyfile(f, new_path)
                     for dylib in need_relinked:
                         if '/System/Library' in dylib or '/usr/lib' in dylib or 'servo' in dylib:
@@ -153,6 +163,45 @@ def package(self, release=False, dev=False, android=None, debug=False, debugger=
             print("Cleaning up")
             delete(dir_to_dmg)
             print("Packaged Servo into " + dmg_path)
+        elif is_windows():
+            dir_to_package = path.dirname(binary_path)
+            dir_to_root = self.get_top_dir()
+            dir_to_msi = path.join(dir_to_package, 'msi')
+            if path.exists(dir_to_msi):
+                print("Cleaning up from previous packaging")
+                delete(dir_to_msi)
+            os.makedirs(dir_to_msi)
+            top_path = dir_to_root
+            browserhtml_path = find_dep_path_newest('browserhtml', binary_path)
+            if browserhtml_path is None:
+                print("Could not find browserhtml package; perhaps you haven't built Servo.")
+                return 1
+            browserhtml_path = path.join(browserhtml_path, "out")
+            # generate Servo.wxs
+            template_path = path.join(dir_to_root, "support", "windows", "Servo.wxs.mako")
+            template = Template(open(template_path).read())
+            wxs_path = path.join(dir_to_msi, "Servo.wxs")
+            open(wxs_path, "w").write(template.render(
+                exe_path=dir_to_package,
+                top_path=top_path,
+                browserhtml_path=browserhtml_path))
+            # run candle and light
+            print("Creating MSI")
+            try:
+                with cd(dir_to_msi):
+                    subprocess.check_call(['candle', wxs_path])
+            except subprocess.CalledProcessError as e:
+                print("WiX candle exited with return value %d" % e.returncode)
+                return e.returncode
+            try:
+                wxsobj_path = "{}.wixobj".format(path.splitext(wxs_path)[0])
+                with cd(dir_to_msi):
+                    subprocess.check_call(['light', wxsobj_path])
+            except subprocess.CalledProcessError as e:
+                print("WiX light exited with return value %d" % e.returncode)
+                return e.returncode
+            msi_path = path.join(dir_to_msi, "Servo.msi")
+            print("Packaged Servo into {}".format(msi_path))
         else:
             dir_to_package = '/'.join(binary_path.split('/')[:-1])
             dir_to_root = '/'.join(binary_path.split('/')[:-3])
diff --git a/resources/Servo.ico b/resources/Servo.ico
new file mode 100644
index 0000000000000000000000000000000000000000..71d38a0c1478abf14b0de4cdaaeb198566b02a7c
GIT binary patch
literal 32988
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
T0_7Aar$9Lc$|>;QNrC?dbNbP4

literal 0
HcmV?d00001

diff --git a/support/windows/Servo.wxs.mako b/support/windows/Servo.wxs.mako
new file mode 100644
index 000000000000..2532267758a4
--- /dev/null
+++ b/support/windows/Servo.wxs.mako
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Product Name="Servo Tech Demo"
+           Manufacturer="Mozilla Research"
+           Id="5807391a-3a17-476b-a5d2-5f1912569762"
+           UpgradeCode="060cd15d-eab1-4614-b438-3988e3efdcf1"
+           Language="1033"
+           Codepage="1252"
+           Version="1.0.0">
+    <Package Id="*"
+             Keywords="Installer"
+             Description="Servo Tech Demo Installer"
+             Manufacturer="Mozilla Research"
+             InstallerVersion="200"
+             Platform="x64"
+             Languages="1033"
+             SummaryCodepage="1252"
+             Compressed="yes"/>
+    <Media Id="1"
+           Cabinet="Servo.cab"
+           EmbedCab="yes"/>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFiles64Folder" Name="PFiles">
+        <Directory Id="MozResearch" Name="Mozilla Research">
+          <Directory Id="INSTALLDIR" Name="Servo Tech Demo">
+            <Component Id="Servo"
+                       Guid="95bcea71-78bb-4ec8-9766-44bc01443840"
+                       Win64="yes">
+              <File Id="ServoEXE"
+                    Name="servo.exe"
+                    DiskId="1"
+                    Source="${windowize(exe_path)}\servo.exe"
+                    KeyPath="yes">
+                <Shortcut Id="StartMenuServoTechDemo"
+                          Directory="ProgramMenuDir"
+                          Name="Servo Tech Demo"
+                          WorkingDirectory="INSTALLDIR"
+                          Icon="Servo.ico"
+                          IconIndex="0"
+                          Arguments="-w --pref dom.mozbrowser.enabled --pref shell.builtin-key-shortcuts.enabled=false browserhtml\index.html"
+                          Advertise="yes"/>
+              </File>
+              <File Id="ServoManifest"
+                    Name="servo.exe.manifest"
+                    Source="${windowize(exe_path)}\servo.exe.manifest"
+                    DiskId="1"/>
+
+              <File Id="StdcxxDLL"
+                    Name="libstdc++-6.dll"
+                    Source="C:\msys64\mingw64\bin\libstdc++-6.dll"
+                    DiskId="1"/>
+              <File Id="WinpthreadDll"
+                    Name="libwinpthread-1.dll"
+                    Source="C:\msys64\mingw64\bin\libwinpthread-1.dll"
+                    DiskId="1"/>
+              <File Id="Bzip2Dll"
+                    Name="libbz2-1.dll"
+                    Source="C:\msys64\mingw64\bin\libbz2-1.dll"
+                    DiskId="1"/>
+              <File Id="GccsehDll"
+                    Name="libgcc_s_seh-1.dll"
+                    Source="C:\msys64\mingw64\bin\libgcc_s_seh-1.dll"
+                    DiskId="1"/>
+              <File Id="ExpatDll"
+                    Name="libexpat-1.dll"
+                    Source="C:\msys64\mingw64\bin\libexpat-1.dll"
+                    DiskId="1"/>
+              <File Id="ZlibDll"
+                    Name="zlib1.dll"
+                    Source="C:\msys64\mingw64\bin\zlib1.dll"
+                    DiskId="1"/>
+              <File Id="PngDll"
+                    Name="libpng16-16.dll"
+                    Source="C:\msys64\mingw64\bin\libpng16-16.dll"
+                    DiskId="1"/>
+              <File Id="IconvDll"
+                    Name="libiconv-2.dll"
+                    Source="C:\msys64\mingw64\bin\libiconv-2.dll"
+                    DiskId="1"/>
+              <File Id="GlibDll"
+                    Name="libglib-2.0-0.dll"
+                    Source="C:\msys64\mingw64\bin\libglib-2.0-0.dll"
+                    DiskId="1"/>
+              <File Id="GraphiteDll"
+                    Name="libgraphite2.dll"
+                    Source="C:\msys64\mingw64\bin\libgraphite2.dll"
+                    DiskId="1"/>
+              <File Id="IntlDll"
+                    Name="libintl-8.dll"
+                    Source="C:\msys64\mingw64\bin\libintl-8.dll"
+                    DiskId="1"/>
+              <File Id="PcreDll"
+                    Name="libpcre-1.dll"
+                    Source="C:\msys64\mingw64\bin\libpcre-1.dll"
+                    DiskId="1"/>
+              <File Id="Eay32Dll"
+                    Name="libeay32.dll"
+                    Source="C:\msys64\mingw64\bin\libeay32.dll"
+                    DiskId="1"/>
+              <File Id="Ssleay32Dll"
+                    Name="ssleay32.dll"
+                    Source="C:\msys64\mingw64\bin\ssleay32.dll"
+                    DiskId="1"/>
+              <File Id="HarfbuzzDll"
+                    Name="libharfbuzz-0.dll"
+                    Source="C:\msys64\mingw64\bin\libharfbuzz-0.dll"
+                    DiskId="1"/>
+              <File Id="FreetypeDll"
+                    Name="libfreetype-6.dll"
+                    Source="C:\msys64\mingw64\bin\libfreetype-6.dll"
+                    DiskId="1"/>
+              <File Id="FontconfigDll"
+                    Name="libfontconfig-1.dll"
+                    Source="C:\msys64\mingw64\bin\libfontconfig-1.dll"
+                    DiskId="1"/>
+            </Component>
+
+            <Directory Id="EtcDir" Name="etc">
+              <Directory Id="FontsDir" Name="fonts">
+                <Component Id="FontsDir"
+                           Guid="8d37ee61-9237-438d-b976-f163bd6b0578"
+                           Win64="yes">
+                  <File Id="ServoFontsConfig"
+                        KeyPath="yes"
+                        Name="fonts.conf"
+                        Source="${windowize(top_path)}\support\windows\fonts.conf"
+                        DiskId="1"/>
+                </Component>
+              </Directory>
+            </Directory>
+
+            ${include_directory(path.join(top_path, "resources"), "resources")}
+            ${include_directory(browserhtml_path, "browserhtml")}
+          </Directory>
+        </Directory>
+      </Directory>
+
+      <Directory Id="ProgramMenuFolder" Name="Programs">
+        <Directory Id="ProgramMenuDir" Name="Servo Tech Demo">
+          <Component Id="ProgramMenuDir" Guid="e04737ce-16eb-4977-9b4c-ed2db8a5a77d">
+            <RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
+            <RegistryValue Root="HKCU"
+                           Key="Software\Mozilla Research\Servo Tech Demo"
+                           Type="string"
+                           Value=""
+                           KeyPath="yes"/>
+          </Component>
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <Feature Id="Complete" Level="1">
+      <ComponentRef Id="Servo"/>
+      <ComponentRef Id="FontsDir"/>
+      % for c in components:
+      <ComponentRef Id="${c}"/>
+      % endfor
+      <ComponentRef Id="ProgramMenuDir"/>
+    </Feature>
+
+    <Icon Id="Servo.ico" SourceFile="${windowize(top_path)}\resources\Servo.ico"/>
+  </Product>
+</Wix>
+<%!
+import os
+import os.path as path
+import re
+import uuid
+
+def make_id(s):
+    return "Id{}".format(s.replace("-", "_").replace("/", "_"))
+
+def listfiles(directory):
+    return [f for f in os.listdir(directory)
+            if path.isfile(path.join(directory, f))]
+
+def listdirs(directory):
+    return [f for f in os.listdir(directory)
+            if path.isdir(path.join(directory, f))]
+
+def windowize(p):
+    if not p.startswith("/"):
+        return p
+    return re.sub("^/([^/])+", "\\1:", p)
+
+components = []
+%>
+<%def name="include_directory(d, n)">
+<Directory Id="${make_id(path.basename(d))}" Name="${n}">
+  <Component Id="${make_id(path.basename(d))}"
+             Guid="${uuid.uuid4()}"
+             Win64="yes">
+    <CreateFolder/>
+    <% components.append(make_id(path.basename(d))) %>
+    % for f in listfiles(d):
+    <File Id="${make_id(path.join(d, f))}"
+          Name="${f}"
+          Source="${windowize(path.join(d, f))}"
+          DiskId="1"/>
+    % endfor
+  </Component>
+
+  % for f in listdirs(d):
+  ${include_directory(path.join(d, f), f)}
+  % endfor
+</Directory>
+</%def>
diff --git a/support/windows/fonts.conf b/support/windows/fonts.conf
new file mode 100644
index 000000000000..d43480eead52
--- /dev/null
+++ b/support/windows/fonts.conf
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<dir>C:\Windows\Fonts</dir>
+<!--
+  Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>mono</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>monospace</string>
+		</edit>
+	</match>
+
+<!--
+  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans serif</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!-- Font cache directory list -->
+
+	<cachedir>~/.fontconfig</cachedir>
+</fontconfig>