{android,win32}/build.py: move class AutotoolsProject to build/autotools.py

android/build.py

@@ -111,46 +111,7 @@ class AndroidNdkToolchain:
         self.env['PKG_CONFIG_LIBDIR'] = os.path.join(install_prefix, 'lib/pkgconfig')
 
 from build.project import Project
-
-class AutotoolsProject(Project):
-    def __init__(self, url, md5, installed, configure_args=[],
-                 autogen=False,
-                 cppflags='',
-                 **kwargs):
-        Project.__init__(self, url, md5, installed, **kwargs)
-        self.configure_args = configure_args
-        self.autogen = autogen
-        self.cppflags = cppflags
-
-    def build(self, toolchain):
-        src = self.unpack(toolchain)
-        if self.autogen:
-            subprocess.check_call(['/usr/bin/aclocal'], cwd=src)
-            subprocess.check_call(['/usr/bin/automake', '--add-missing', '--force-missing', '--foreign'], cwd=src)
-            subprocess.check_call(['/usr/bin/autoconf'], cwd=src)
-            subprocess.check_call(['/usr/bin/libtoolize', '--force'], cwd=src)
-
-        build = self.make_build_path(toolchain)
-
-        configure = [
-            os.path.join(src, 'configure'),
-            'CC=' + toolchain.cc,
-            'CXX=' + toolchain.cxx,
-            'CFLAGS=' + toolchain.cflags,
-            'CXXFLAGS=' + toolchain.cxxflags,
-            'CPPFLAGS=' + toolchain.cppflags + ' ' + self.cppflags,
-            'LDFLAGS=' + toolchain.ldflags,
-            'LIBS=' + toolchain.libs,
-            'AR=' + toolchain.ar,
-            'STRIP=' + toolchain.strip,
-            '--host=' + toolchain.arch,
-            '--prefix=' + toolchain.install_prefix,
-            '--enable-silent-rules',
-        ] + self.configure_args
-
-        subprocess.check_call(configure, cwd=build, env=toolchain.env)
-        subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], cwd=build, env=toolchain.env)
-        subprocess.check_call(['/usr/bin/make', '--quiet', 'install'], cwd=build, env=toolchain.env)
+from build.autotools import AutotoolsProject
 
 class FfmpegProject(Project):
     def __init__(self, url, md5, installed, configure_args=[],

python/build/autotools.py

+import os.path, subprocess
+
+from build.project import Project
+
+class AutotoolsProject(Project):
+    def __init__(self, url, md5, installed, configure_args=[],
+                 autogen=False,
+                 cppflags='',
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.configure_args = configure_args
+        self.autogen = autogen
+        self.cppflags = cppflags
+
+    def build(self, toolchain):
+        src = self.unpack(toolchain)
+        if self.autogen:
+            subprocess.check_call(['/usr/bin/aclocal'], cwd=src)
+            subprocess.check_call(['/usr/bin/automake', '--add-missing', '--force-missing', '--foreign'], cwd=src)
+            subprocess.check_call(['/usr/bin/autoconf'], cwd=src)
+            subprocess.check_call(['/usr/bin/libtoolize', '--force'], cwd=src)
+
+        build = self.make_build_path(toolchain)
+
+        configure = [
+            os.path.join(src, 'configure'),
+            'CC=' + toolchain.cc,
+            'CXX=' + toolchain.cxx,
+            'CFLAGS=' + toolchain.cflags,
+            'CXXFLAGS=' + toolchain.cxxflags,
+            'CPPFLAGS=' + toolchain.cppflags + ' ' + self.cppflags,
+            'LDFLAGS=' + toolchain.ldflags,
+            'LIBS=' + toolchain.libs,
+            'AR=' + toolchain.ar,
+            'STRIP=' + toolchain.strip,
+            '--host=' + toolchain.arch,
+            '--prefix=' + toolchain.install_prefix,
+            '--enable-silent-rules',
+        ] + self.configure_args
+
+        subprocess.check_call(configure, cwd=build, env=toolchain.env)
+        subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'],
+                              cwd=build, env=toolchain.env)
+        subprocess.check_call(['/usr/bin/make', '--quiet', 'install'],
+                              cwd=build, env=toolchain.env)

win32/build.py

@@ -59,48 +59,7 @@ class CrossGccToolchain:
         self.env['PKG_CONFIG_LIBDIR'] = os.path.join(install_prefix, 'lib/pkgconfig')
 
 from build.project import Project
-
-class AutotoolsProject(Project):
-    def __init__(self, url, md5, installed, configure_args=[],
-                 autogen=False,
-                 cppflags='',
-                 **kwargs):
-        Project.__init__(self, url, md5, installed, **kwargs)
-        self.configure_args = configure_args
-        self.autogen = autogen
-        self.cppflags = cppflags
-
-    def build(self, toolchain):
-        src = self.unpack(toolchain)
-        if self.autogen:
-            subprocess.check_call(['/usr/bin/aclocal'], cwd=src)
-            subprocess.check_call(['/usr/bin/automake', '--add-missing', '--force-missing', '--foreign'], cwd=src)
-            subprocess.check_call(['/usr/bin/autoconf'], cwd=src)
-            subprocess.check_call(['/usr/bin/libtoolize', '--force'], cwd=src)
-
-        build = self.make_build_path(toolchain)
-
-        configure = [
-            os.path.join(src, 'configure'),
-            'CC=' + toolchain.cc,
-            'CXX=' + toolchain.cxx,
-            'CFLAGS=' + toolchain.cflags,
-            'CXXFLAGS=' + toolchain.cxxflags,
-            'CPPFLAGS=' + toolchain.cppflags + ' ' + self.cppflags,
-            'LDFLAGS=' + toolchain.ldflags,
-            'LIBS=' + toolchain.libs,
-            'AR=' + toolchain.ar,
-            'STRIP=' + toolchain.strip,
-            '--host=' + toolchain.arch,
-            '--prefix=' + toolchain.install_prefix,
-            '--enable-silent-rules',
-        ] + self.configure_args
-
-        subprocess.check_call(configure, cwd=build, env=toolchain.env)
-        subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'],
-                              cwd=build, env=toolchain.env)
-        subprocess.check_call(['/usr/bin/make', '--quiet', 'install'],
-                              cwd=build, env=toolchain.env)
+from build.autotools import AutotoolsProject
 
 class ZlibProject(Project):
     def __init__(self, url, md5, installed,