From cf5b0f68d28b274bfec2648d4dc44fe19aa97931 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 12 Jul 2014 18:35:21 +0530
Subject: [PATCH] Parallelize building of linux launchers

---
 setup/installer/__init__.py      |  3 ++-
 setup/installer/linux/freeze2.py | 27 +++++++++++----------------
 setup/parallel_build.py          |  9 +++++----
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/setup/installer/__init__.py b/setup/installer/__init__.py
index f17aab8493..2b21a5bdca 100644
--- a/setup/installer/__init__.py
+++ b/setup/installer/__init__.py
@@ -163,7 +163,8 @@ class VMInstaller(Command):
         start_time = time.time()
         self.run_vm_builder()
         print ('Startup completed in %d seconds' % round(startup_time))
-        print ('Build completed in %d seconds' % round(time.time() - start_time))
+        secs = time.time() - start_time
+        print ('Build completed in %d minutes %d seconds' % (secs // 60, secs % 60))
         if not opts.dont_shutdown:
             print ('Shutting down', self.VM_NAME)
             subprocess.call(['ssh', self.VM_NAME]+self.SHUTDOWN_CMD)
diff --git a/setup/installer/linux/freeze2.py b/setup/installer/linux/freeze2.py
index bad17989d1..6dff93fc7b 100644
--- a/setup/installer/linux/freeze2.py
+++ b/setup/installer/linux/freeze2.py
@@ -57,6 +57,7 @@ from functools import partial
 
 from setup import Command, modules, basenames, functions, __version__,  __appname__
 from setup.build_environment import QT_DLLS, QT_PLUGINS, qt, PYQT_MODULES, sw as SW
+from setup.parallel_build import create_job, parallel_build
 
 j = os.path.join
 is64bit = platform.architecture()[0] == '64bit'
@@ -283,7 +284,8 @@ class LinuxFreeze(Command):
         else:
             start_time = time.time()
             subprocess.check_call(['xz', '--threads=0', '-f', '-9', dist])
-            self.info('Compressed in %d seconds' % round(time.time() - start_time))
+            secs = time.time() - start_time
+            self.info('Compressed in %d minutes %d seconds' % (secs // 60, secs % 60))
             os.rename(dist + '.xz', ans)
         self.info('Archive %s created: %.2f MB'%(
             os.path.basename(ans), os.stat(ans).st_size/(1024.**2)))
@@ -322,8 +324,9 @@ class LinuxFreeze(Command):
         self.info('Compiling launcher')
         self.run_builder(cmd, verbose=False)
 
+        jobs = []
+        self.info('Processing launchers')
         for typ in ('console', 'gui', ):
-            self.info('Processing %s launchers'%typ)
             for mod, bname, func in zip(modules[typ], basenames[typ],
                     functions[typ]):
                 xflags = list(cflags)
@@ -331,25 +334,17 @@ class LinuxFreeze(Command):
                 xflags += ['-DMODULE="%s"'%mod, '-DBASENAME="%s"'%bname,
                     '-DFUNCTION="%s"'%func]
 
-                dest = self.j(self.obj_dir, bname+'.o')
-                if self.newer(dest, [src, __file__]+headers):
-                    cmd = ['gcc'] + xflags + [src, '-o', dest]
-                    self.run_builder(cmd, verbose=False)
                 exe = self.j(self.bin_dir, bname)
+                if self.newer(exe, [src, __file__]+headers):
+                    cmd = ['gcc'] + xflags + [src, '-o', exe, '-L' + self.lib_dir, '-lcalibre-launcher']
+                    jobs.append(create_job(cmd))
                 sh = self.j(self.base, bname)
                 shutil.copy2(c_launcher, sh)
                 os.chmod(sh,
                     stat.S_IREAD|stat.S_IEXEC|stat.S_IWRITE|stat.S_IRGRP|stat.S_IXGRP|stat.S_IROTH|stat.S_IXOTH)
-
-                if self.newer(exe, [dest, __file__]):
-                    cmd = ['gcc', '-O2',
-                            '-o', exe,
-                            dest,
-                            '-L'+self.lib_dir,
-                            '-lcalibre-launcher',
-                            ]
-
-                    self.run_builder(cmd, verbose=False)
+        if jobs:
+            if not parallel_build(jobs, self.info, verbose=False):
+                raise SystemExit(1)
 
     def strip_files(self):
         from calibre import walk
diff --git a/setup/parallel_build.py b/setup/parallel_build.py
index 97ffdc8cc8..df8e9e84b8 100644
--- a/setup/parallel_build.py
+++ b/setup/parallel_build.py
@@ -26,12 +26,13 @@ def run_worker(job):
 def create_job(cmd, human_text=None):
     return (cmd, human_text)
 
-def parallel_build(jobs, log):
+def parallel_build(jobs, log, verbose=True):
     p = Pool(cpu_count)
     for ok, stdout, stderr in p.imap(run_worker, jobs):
-        log(stdout)
-        if stderr:
-            log(stderr)
+        if verbose or not ok:
+            log(stdout)
+            if stderr:
+                log(stderr)
         if not ok:
             return False
     return True