win32/build.py: build zlib in-tree

zlib cannot be built out-of-tree, and previously, we were building in the "src" directory, not in the "build" directory. The make_build_path() return value was unused.

win32/build.py: build zlib in-tree
6837a672 · Max Kellermann · d6eb7426 · 6837a672
Commit 6837a672 authored Jun 03, 2015 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

build.py win32/build.py +10 -8

No files found.
--- a/win32/build.py
+++ b/win32/build.py
@@ -121,16 +121,20 @@ class Project:
        except FileNotFoundError:
            return False

-    def unpack(self):
-        global src_path
+    def unpack(self, out_of_tree=True):
+        global src_path, build_path
        tarball = self.download()
-        path = os.path.join(src_path, self.base)
+        if out_of_tree:
+            parent_path = src_path
+        else:
+            parent_path = build_path
+        path = os.path.join(parent_path, self.base)
        try:
            shutil.rmtree(path)
        except FileNotFoundError:
            pass
-        os.makedirs(src_path, exist_ok=True)
-        subprocess.check_call(['/bin/tar', 'xfC', tarball, src_path])
+        os.makedirs(parent_path, exist_ok=True)
+        subprocess.check_call(['/bin/tar', 'xfC', tarball, parent_path])
        return path

    def make_build_path(self):
@@ -189,9 +193,7 @@ class ZlibProject(Project):
        Project.__init__(self, url, md5, installed, **kwargs)

    def build(self):
-        src = self.unpack()
-
-        build = self.make_build_path()
+        src = self.unpack(out_of_tree=False)

        select_toolchain()
        subprocess.check_call(['/usr/bin/make', '--quiet',