diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-07-11 01:16:59 +0530 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-07-10 21:53:01 +0000 |
| commit | 328ed72888f8828ae7001c2d7e61ddcd2c71aa18 (patch) | |
| tree | 6783060c209c68a2546daa154041b704895992b8 | |
| parent | c24f23c6700655720475437d5bc37beb007bcb04 (diff) | |
cerbero/bootstrap: Nitpick some variable names and comments
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/540>
| -rw-r--r-- | cerbero/bootstrap/windows.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/cerbero/bootstrap/windows.py b/cerbero/bootstrap/windows.py index 7f7468e2..a5557e85 100644 --- a/cerbero/bootstrap/windows.py +++ b/cerbero/bootstrap/windows.py @@ -48,10 +48,8 @@ KHRONOS_WGL_TPL = 'https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registr WGL_CHECKSUM = '8961c809d180e3590fca32053341fe3a83394edcb936f7699f0045feadb16115' # Extra binary dependencies -GNOME_FTP = 'https://download.gnome.org/binaries/win32/' -WINDOWS_BIN_DEPS = [ - ('intltool/0.40/intltool_0.40.4-1_win32.zip', - '7180a780cee26c5544c06a73513c735b7c8c107db970b40eb7486ea6c936cb33')] +INTLTOOL_URL = 'https://download.gnome.org/binaries/win32/intltool/0.40/intltool_0.40.4-1_win32.zip' +INTLTOOL_CHECKSUM = '7180a780cee26c5544c06a73513c735b7c8c107db970b40eb7486ea6c936cb33' # MSYS packages needed MINGWGET_DEPS = ['msys-flex', 'msys-bison', 'msys-perl'] @@ -92,10 +90,8 @@ class WindowsBootstrapper(BootstrapperBase): # Newer versions of binary deps such as intltool. Must be extracted # after the MinGW toolchain from above is extracted so that it # replaces the older files. - for dep, checksum in WINDOWS_BIN_DEPS: - url = GNOME_FTP + dep - self.fetch_urls.append((url, checksum)) - self.extract_steps.append((url, True, self.prefix)) + self.fetch_urls.append((INTLTOOL_URL, INTLTOOL_CHECKSUM)) + self.extract_steps.append((INTLTOOL_URL, True, self.prefix)) def start(self, jobs=0): if not git.check_line_endings(self.config.platform): @@ -107,8 +103,7 @@ class WindowsBootstrapper(BootstrapperBase): self.fix_mingw() self.fix_openssl_mingw_perl() self.fix_bin_deps() - # FIXME: This uses the network - self.install_mingwget_deps() + self.install_mingwget_deps() # FIXME: This uses the network self.fix_mingw_unused() def check_dirs(self): |