Merge branch 'master' of newton:/data1/x0-0-0/pwr

src/doc/prm/src/os_templ/hw_templ/Doxyfile

@@ -1080,7 +1080,7 @@ SERVER_BASED_SEARCH    = NO
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be

src/tools/pwre/src/os_linux/pwre.pl

@@ -67,6 +67,8 @@ if (($dbname = $ENV{"pwre_env_db"}) eq "") {
 $os = substr( $ENV{"pwre_os"}, 3, 100);
 $hw = substr( $ENV{"pwre_hw"}, 3, 100);
 $configfile = $ENV{"pwre_broot"} . "/pwre_" . $hw . "_" . $os . ".cnf";
+$parallel = $ENV{"PWRE_CONF_PARALLEL"};
+printf( "Parallel %s\n", $parallel);
 
 
 $arg1 = $ARGV[0];
@@ -1465,8 +1467,10 @@ sub _build () # args: branch, subbranch, flavour, phase
           if ($hw eq "x86" && $real_hw eq "x86_64") {
             $ENV{"cross_compile"} = "-m32";
           }
-          if (($branch eq "lib" && $subbranch ne "dtt") || $branch eq "wbl") {
+
+          if (($parallel eq "1" && $branch eq "lib" && $subbranch ne "dtt") || $branch eq "wbl") {
             # All libraries and wbl files can be compiled in parallel
+	    printf( "Parallel %s", $parallel);
             system("make -j @_") && exit 1;
           } else {
             system("make @_") && exit 1;

src/tools/pwre/src/os_linux/pwre_configure.sh

@@ -16,6 +16,8 @@ Arguments
 --reset-version  Reset previous version
 --lock-dbs       Lock dbs-files. Dbs-files will not be rebuilt.
 --unlock-dbs     Unlock dbs-files
+--parallel       Build with parallel execution.
+--not-parallel   Don't build with parallel execution
 
 EOF
 }
@@ -336,24 +338,32 @@ fi
 declare -i buildversion_set=0
 declare -i lockdbs_set=0
 declare -i lockdbs=0
+declare -i parallel_set=0
+declare -i parallel=0
 if [ "$1" = "--help" ]; then
     pwre_help
     exit
-    elif [ "$1" = "--version" ] && [ "$2" != "" ] && [ "$3" != "" ]; then
+elif [ "$1" = "--version" ] && [ "$2" != "" ] && [ "$3" != "" ]; then
     buildversion=$2" "$3
     buildversion_set=1
-    elif [ "$1" = "--reset-version" ]; then
+elif [ "$1" = "--reset-version" ]; then
     buildversion=""
     buildversion_set=1
-    elif [ "$1" = "--lock-dbs" ]; then
+elif [ "$1" = "--lock-dbs" ]; then
     lockdbs=1
     lockdbs_set=1
-    elif [ "$1" = "--unlock-dbs" ]; then
+elif [ "$1" = "--unlock-dbs" ]; then
     lockdbs=0
     lockdbs_set=1
-    elif [ "$1" = "--ebuild" ]; then
+elif [ "$1" = "--parallel" ]; then
+    parallel=1
+    parallel_set=1
+elif [ "$1" = "--not-parallel" ]; then
+    parallel=0
+    parallel_set=1
+elif [ "$1" = "--ebuild" ]; then
     ebuild=1
-    elif [ "$1" != "" ]; then
+elif [ "$1" != "" ]; then
     echo "Unknown option \"$1\""
     exit
 fi
@@ -375,6 +385,14 @@ if [ $lockdbs_set -eq 0 ]; then
         lockdbs=$ver
     fi
 fi
+if [ $parallel_set -eq 0 ]; then
+    # Catch current value
+    if [ -e $cfile ]; then
+        ver=`eval cat $cfile | grep "\bexport PWRE_CONF_PARALLEL"`
+        ver=${ver#*=}
+        parallel=$ver
+    fi
+fi
 
 
 pwre_create_blddir
@@ -388,6 +406,7 @@ else
     echo "export PWRE_CONF_BUILDVERSION=\"0\"" >> $cfile
 fi
 echo "export PWRE_CONF_LOCKDBS=$lockdbs" >> $cfile
+echo "export PWRE_CONF_PARALLEL=$parallel" >> $cfile
 
 if [ $pwre_hw == "hw_arm" ] && [ $ebuild -eq 1 ]; then
     echo "Arm ebuild"