diff options
| author | ddh <dianehosfelt@gmail.com> | 2017-01-11 12:07:36 +0000 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-03-31 16:32:21 +0200 |
| commit | e527c9a991c00a3d01fcf262b9fee0b5c948436e (patch) | |
| tree | 75a909ab4048eb74174454d65758efbb6c63934e /python/servo | |
| parent | f66cae3f96c1b9a835f2d33477593e083395f402 (diff) | |
| download | servo-e527c9a991c00a3d01fcf262b9fee0b5c948436e.tar.gz servo-e527c9a991c00a3d01fcf262b9fee0b5c948436e.zip | |
Update Hyper and OpenSSL
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/bootstrap.py | 2 | ||||
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/command_base.py | 2 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 6 | ||||
| -rw-r--r-- | python/servo/packages.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index f65cd7208e5..72867fcf155 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -196,7 +196,7 @@ def windows_msvc(context, force=False): '''Bootstrapper for MSVC building on Windows.''' deps_dir = os.path.join(context.sharedir, "msvc-dependencies") - deps_url = "https://servo-rust.s3.amazonaws.com/msvc-deps/" + deps_url = "https://servo-deps.s3.amazonaws.com/msvc-deps/" def version(package): return packages.WINDOWS_MSVC[package] diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 5fbb7ba164d..a8cb0f9e4a9 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -321,7 +321,7 @@ class MachCommands(CommandBase): call(["editbin", "/nologo", "/subsystem:windows", path.join(servo_exe_dir, "servo.exe")], verbose=verbose) # on msvc, we need to copy in some DLLs in to the servo.exe dir - for ssl_lib in ["ssleay32md.dll", "libeay32md.dll"]: + for ssl_lib in ["libcryptoMD.dll", "libsslMD.dll"]: shutil.copy(path.join(env['OPENSSL_LIB_DIR'], "../bin" + msvc_x64, ssl_lib), servo_exe_dir) diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 4ee5819ee57..8db1209a6e4 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -407,7 +407,7 @@ class CommandBase(object): # Link openssl env["OPENSSL_INCLUDE_DIR"] = path.join(package_dir("openssl"), "include") env["OPENSSL_LIB_DIR"] = path.join(package_dir("openssl"), "lib" + msvc_x64) - env["OPENSSL_LIBS"] = "ssleay32MD:libeay32MD" + env["OPENSSL_LIBS"] = "libsslMD:libcryptoMD" # Link moztools env["MOZTOOLS_PATH"] = path.join(package_dir("moztools"), "bin") diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index d8c2fbe4924..16c942efe7c 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -108,7 +108,7 @@ def copy_dependencies(binary_path, lib_path): def copy_windows_dependencies(binary_path, destination): try: - [shutil.copy(path.join(binary_path, d), destination) for d in ["libeay32md.dll", "ssleay32md.dll"]] + [shutil.copy(path.join(binary_path, d), destination) for d in ["libcryptoMD.dll", "libsslMD.dll"]] except: deps = [ "libstdc++-6.dll", @@ -119,8 +119,8 @@ def copy_windows_dependencies(binary_path, destination): "zlib1.dll", "libiconv-2.dll", "libintl-8.dll", - "libeay32.dll", - "ssleay32.dll", + "libcryptoMD.dll", + "libsslMD.dll", ] for d in deps: dep_path = path.join("C:\\msys64\\mingw64\\bin", d) diff --git a/python/servo/packages.py b/python/servo/packages.py index e8054f9a502..1413e1c645a 100644 --- a/python/servo/packages.py +++ b/python/servo/packages.py @@ -21,5 +21,5 @@ WINDOWS_MSVC = { "cmake": "3.6.1", "moztools": "0.0.1-5", "ninja": "1.7.1", - "openssl": "1.0.1t-vs2015", + "openssl": "1.1.0e-vs2015", } |