Fix for #4 - remove duplication in code for getting processor count.

Author: timlinux

fabgis/gdal.py

@@ -9,7 +9,7 @@
 from fabric.api import fastprint, run, cd, env, task, sudo, settings
 
 from .common import add_ubuntugis_ppa, setup_env
-from .system import setup_ccache
+from .system import setup_ccache, get_processor_count
 from .proj4 import build_proj4
 
 
@@ -61,7 +61,7 @@ def build_gdal(with_ecw=False, with_mrsid=False):
         '--with-spatialite '
         '--without-libtool')
 
-    processor_count = run('cat /proc/cpuinfo | grep processor | wc -l')
+    processor_count = get_processor_count()
 
     # Currently you need to have downloaded the MRSID sdk to remote home dir
     if with_mrsid:

fabgis/hdf.py

@@ -9,7 +9,7 @@
 from fabric.contrib.files import exists
 from fabric.api import fastprint, run, cd, env, task, sudo, settings
 
-from .system import setup_ccache
+from .system import setup_ccache, get_processor_count
 from .common import setup_env
 from .utilities import append_if_not_present
 
@@ -42,7 +42,7 @@ def build_hdf5(version='1.8.11'):
             run('wget %s' % source_url)
             run('tar xfz %s.tar.gz' % filename)
 
-    processor_count = run('cat /proc/cpuinfo | grep processor | wc -l')
+    processor_count = get_processor_count()
 
     with cd(code_path):
         # Dont fail if make clean does not work

fabgis/proj4.py

@@ -5,15 +5,19 @@
 
 """
 
+
 import fabtools
 from fabric.contrib.files import exists
 from fabric.api import fastprint, run, cd, env, task, sudo, settings
 
-from .system import setup_ccache
+from .system import setup_ccache, get_processor_count
 from .common import setup_env
 from .utilities import append_if_not_present
 
 
+
+
+
 @task
 def build_proj4(version='4.8.0'):
     """Get proj4 from tarball and build it.
@@ -40,7 +44,7 @@ def build_proj4(version='4.8.0'):
             run('wget %s' % source_url)
             run('tar xfz %s.tar.gz' % filename)
 
-    processor_count = run('cat /proc/cpuinfo | grep ^processor | wc -l')
+    processor_count = get_processor_count()
 
     with cd(code_path):
         # Dont fail if make clean does not work

fabgis/qgis.py

@@ -14,7 +14,7 @@
 from .common import add_ubuntugis_ppa
 from .common import setup_env
 from .git import update_git_checkout
-from .system import setup_ccache
+from .system import setup_ccache, get_processor_count
 from .gdal import build_gdal
 from .postgres import create_postgis_1_5_db
 
@@ -96,18 +96,19 @@ def compile_qgis(build_path, build_prefix, gdal_from_source=False):
             build_gdal()  # see that task for ecw and mrsid support
             extra += '-DGDAL_CONFIG=/usr/local/bin/gdal-config '
 
-        cmake = ('cmake .. '
-                 '-DCMAKE_INSTALL_PREFIX=%s '
-                 '-DCMAKE_CXX_COMPILER:FILEPATH=/usr/local/bin/g++ '
-                 '-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 '
-                 '-DWITH_MAPSERVER=ON '
-                 '-DWITH_INTERNAL_SPATIALITE=ON '
-                 '-DWITH_GRASS=OFF '
-                 '-DCMAKE_BUILD_TYPE=Debug '
-                 '%s'
-                 % (build_prefix, extra))
+        cmake = (
+            'cmake .. '
+            '-DCMAKE_INSTALL_PREFIX=%s '
+            '-DCMAKE_CXX_COMPILER:FILEPATH=/usr/local/bin/g++ '
+            '-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 '
+            '-DWITH_MAPSERVER=ON '
+            '-DWITH_INTERNAL_SPATIALITE=ON '
+            '-DWITH_GRASS=OFF '
+            '-DCMAKE_BUILD_TYPE=Debug '
+            '%s'
+             % (build_prefix, extra))
         run(cmake)
-        processor_count = run('cat /proc/cpuinfo | grep processor | wc -l')
+        processor_count = get_processor_count()
         run('time make -j %s install' % processor_count)
 
 

fabgis/system.py

@@ -11,6 +11,7 @@
 from fabric.contrib.files import contains, exists, append, sed
 from fabric.colors import red
 from fabric.api import env, task, sudo, local, reboot
+from fabric.operations import run
 import fabtools
 from .utilities import append_if_not_present
 
@@ -318,3 +319,7 @@ def masquerade():
         sed(rc_file, '^exit 0', '#exit 0', use_sudo=True)
         append(rc_file, rule_1, use_sudo=True)
         append(rc_file, rule_2, use_sudo=True)
+
+
+def get_processor_count():
+    return run('cat /proc/cpuinfo | grep ^processor | wc -l')