From bedbd132d570b1c3fd8b49e1b4b51d0465b75e1f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 21 Oct 2013 13:11:34 +0200
Subject: Add -j to dist.sh

---
 dist.sh | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'dist.sh')

diff --git a/dist.sh b/dist.sh
index 386d35f..20d4c07 100755
--- a/dist.sh
+++ b/dist.sh
@@ -15,6 +15,7 @@
 # -cxxpflags <g++-plugin-compiler-flags>
 # -<db>-options <options>
 # -<db>-test-options <options>
+# -j <jobs>
 #
 trap 'exit 1' ERR
 
@@ -55,6 +56,7 @@ ccp=gcc-4.5
 cxxp=g++-4.5
 cxxflags="-W -Wall -Wno-unknown-pragmas -O3"
 cxxpflags="-W -Wall -O3"
+jobs=22
 
 mysql_options=
 mysql_test_options=
@@ -172,6 +174,11 @@ while [ $# -gt 0 ]; do
       mssql_test_options=$1
       shift
       ;;
+    -j)
+      shift
+      jobs=$1
+      shift
+      ;;
     *)
       error "unknown option: $1"
       exit 1
@@ -228,7 +235,7 @@ mkdir -p $out_root/pack
 if [ $complete = y ]; then
   cd $src_root/../cutl
   ./dist.sh -cc "$ccp" -cxx "$cxxp" -cxxflags "$cxxpflags" \
--out "$out_root/libcutl" -no-check
+-out "$out_root/libcutl" -no-check -j $jobs
   cd $wd
 fi
 
@@ -244,7 +251,7 @@ dist dist_prefix=$out_root/odb
   ./configure --with-libcutl=../libcutl CC="$ccp" CXX="$cxxp" \
 CXXFLAGS="$cxxpflags"
 
-  make -j 8
+  make -j $jobs
   make dist
 
   cd $wd
@@ -268,7 +275,7 @@ if [ $rebuild = y ]; then
   ./configure CC="$cc" CXX="$cxx" CXXFLAGS="$cxxflags"
 fi
 
-make -j 8
+make -j $jobs
 make dist
 
 cd $wd
@@ -292,7 +299,7 @@ if [ $rebuild = y ]; then
               $mssql_options
 fi
 
-make -j 8
+make -j $jobs
 make dist
 
 cd $wd
@@ -316,7 +323,7 @@ if [ $rebuild = y ]; then
               $oracle_options
 fi
 
-make -j 8
+make -j $jobs
 make dist
 
 cd $wd
@@ -340,7 +347,7 @@ if [ $rebuild = y ]; then
               $pgsql_options
 fi
 
-make -j 8
+make -j $jobs
 make dist
 
 cd $wd
@@ -364,7 +371,7 @@ if [ $rebuild = y ]; then
               $sqlite_options
 fi
 
-make -j 8
+make -j $jobs
 make dist
 
 cd $wd
@@ -388,7 +395,7 @@ if [ $rebuild = y ]; then
               $mysql_options
 fi
 
-make -j 8
+make -j $jobs
 make dist
 
 cd $wd
@@ -409,7 +416,7 @@ if [ $rebuild = y ]; then
   ./configure --with-libodb=../libodb CC="$cc" CXX="$cxx" CXXFLAGS="$cxxflags"
 fi
 
-make -j 8
+make -j $jobs
 make dist
 
 cd $wd
@@ -430,7 +437,7 @@ if [ $rebuild = y ]; then
   ./configure --with-libodb=../libodb CC="$cc" CXX="$cxx" CXXFLAGS="$cxxflags"
 fi
 
-make -j 8
+make -j $jobs
 make dist
 
 cd $wd
@@ -474,7 +481,8 @@ ODB=$odb
   fi
 
   if [ $test = y ]; then
-    make -j 8 check
+    make -j $jobs
+    make check
   fi
 
   if [ "$dist_tests" = "" ]; then
@@ -525,7 +533,8 @@ ODB=$odb
   fi
 
   if [ $test = y ]; then
-    make -j 8 check
+    make -j $jobs
+    make check
   fi
 
   if [ "$dist_examples" = "" ]; then
-- 
cgit v1.1