diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-02-05 17:33:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-05 17:33:23 -0800 |
| commit | e8d677f9c5caed7e8c750fad7b4fb2eae4744c93 (patch) | |
| tree | a9dedc6583246fa55d5265f36cf74582a7c935ba /python | |
| parent | 5f0c294caf85e67ff5b04f28b4a4d54930d7d952 (diff) | |
| parent | e0a20b5568ff364cd5b48b15713eb11a253bd975 (diff) | |
| download | servo-e8d677f9c5caed7e8c750fad7b4fb2eae4744c93.tar.gz servo-e8d677f9c5caed7e8c750fad7b4fb2eae4744c93.zip | |
Auto merge of #15393 - UK992:win32, r=metajack
Windows: Instructions update, removed freetype and silent some warning
i made some changes to Windows instruction, more unified.
Also removed freetype dependencies on Windows, by forcing to build harfbuzz from source, which is also dependent on freetype.
cc @larsbergstrom @metajack
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15393)
<!-- Reviewable:end -->
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/command_base.py | 2 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 12 | ||||
| -rw-r--r-- | python/servo/packages.py | 1 |
3 files changed, 6 insertions, 9 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 8149a705014..3169e9c9d6a 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -401,6 +401,8 @@ class CommandBase(object): if is_windows(): if not os.environ.get("NATIVE_WIN32_PYTHON"): env["NATIVE_WIN32_PYTHON"] = sys.executable + # Always build harfbuzz from source + env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true" if not self.config["tools"]["system-rust"] \ or self.config["tools"]["rust-root"]: diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 1da21d24a45..d8c2fbe4924 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -117,19 +117,15 @@ def copy_windows_dependencies(binary_path, destination): "libgcc_s_seh-1.dll", "libexpat-1.dll", "zlib1.dll", - "libpng16-16.dll", "libiconv-2.dll", - "libglib-2.0-0.dll", - "libgraphite2.dll", - "libfreetype-6.dll", - "libfontconfig-1.dll", "libintl-8.dll", - "libpcre-1.dll", "libeay32.dll", "ssleay32.dll", - "libharfbuzz-0.dll", ] - [shutil.copy(path.join("C:\\msys64\\mingw64\\bin", d), path.join(destination, d)) for d in deps] + for d in deps: + dep_path = path.join("C:\\msys64\\mingw64\\bin", d) + if path.exists(dep_path): + shutil.copy(dep_path, path.join(destination, d)) def change_prefs(resources_path, platform): diff --git a/python/servo/packages.py b/python/servo/packages.py index 9e4906dc5cf..e8054f9a502 100644 --- a/python/servo/packages.py +++ b/python/servo/packages.py @@ -6,7 +6,6 @@ WINDOWS_GNU = set([ "diffutils", "make", "mingw-w64-x86_64-toolchain", - "mingw-w64-x86_64-freetype", "mingw-w64-x86_64-icu", "mingw-w64-x86_64-nspr", "mingw-w64-x86_64-ca-certificates", |