From 754b30a7a6ea9d0200e36c9b66819d9c1d40b05e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 21 Nov 2015 00:43:50 +0100 Subject: [PATCH] win32/build.py: move class ZlibProject to build/zlib.py --- python/build/zlib.py | 22 ++++++++++++++++++++++ win32/build.py | 20 +------------------- 2 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 python/build/zlib.py diff --git a/python/build/zlib.py b/python/build/zlib.py new file mode 100644 index 000000000..2ed140554 --- /dev/null +++ b/python/build/zlib.py @@ -0,0 +1,22 @@ +import subprocess + +from build.project import Project + +class ZlibProject(Project): + def __init__(self, url, md5, installed, + **kwargs): + Project.__init__(self, url, md5, installed, **kwargs) + + def build(self, toolchain): + src = self.unpack(toolchain, out_of_tree=False) + + subprocess.check_call(['/usr/bin/make', '--quiet', + '-f', 'win32/Makefile.gcc', + 'PREFIX=' + toolchain.arch + '-', + '-j12', + 'install', + 'DESTDIR=' + toolchain.install_prefix + '/', + 'INCLUDE_PATH=include', + 'LIBRARY_PATH=lib', + 'BINARY_PATH=bin', 'SHARED_MODE=1'], + cwd=src, env=toolchain.env) diff --git a/win32/build.py b/win32/build.py index ece62d25e..05095d86f 100755 --- a/win32/build.py +++ b/win32/build.py @@ -62,29 +62,11 @@ class CrossGccToolchain: self.env['PKG_CONFIG_LIBDIR'] = os.path.join(install_prefix, 'lib/pkgconfig') from build.project import Project +from build.zlib import ZlibProject from build.autotools import AutotoolsProject from build.ffmpeg import FfmpegProject from build.boost import BoostProject -class ZlibProject(Project): - def __init__(self, url, md5, installed, - **kwargs): - Project.__init__(self, url, md5, installed, **kwargs) - - def build(self, toolchain): - src = self.unpack(toolchain, out_of_tree=False) - - subprocess.check_call(['/usr/bin/make', '--quiet', - '-f', 'win32/Makefile.gcc', - 'PREFIX=' + toolchain.arch + '-', - '-j12', - 'install', - 'DESTDIR=' + toolchain.install_prefix + '/', - 'INCLUDE_PATH=include', - 'LIBRARY_PATH=lib', - 'BINARY_PATH=bin', 'SHARED_MODE=1'], - cwd=src, env=toolchain.env) - # a list of third-party libraries to be used by MPD on Android thirdparty_libs = [ AutotoolsProject(