AllwmakeParseArguments: Moved all parallel processing options into wmake

and added support for queue scheduling option '-q', '-queue'

Now the 'Allwmake' scripts execute 'wmake -all' to handle parallel
processing in a general way, avoiding code duplication.

wmake/scripts/AllwmakeParseArguments

@@ -28,9 +28,6 @@
 #     Allwmake argument parser
 #
 # Usage
-#     # Declare genDoc and set to default if documentation building is supported
-#     genDoc=0              # 0 or 1
-#
 #     # Parse the arguments by sourcing this script
 #     . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 #
@@ -46,118 +43,51 @@ usage() {
 
 Usage: $Script [OPTIONS]
 
-options:
-  -h or -help       Print list of Allwmake options
-  -k or -non-stop   Compile without stopping when errors occur
-  -j                Compile using all local cores/hyperthreads
-  -jN or -j N       Compile using N cores/hyperthreads
-  -no-scheduler     Compile without wmakeScheduler
-  -update           Update lnInclude directories, dep files, remove deprecated
-                    files and directories
+Executing $Script is equivalent to
+
+   wmake -all [OPTIONS]
 USAGE
 
-    # Print options for building code documentation
-    test -n "$genDoc" && cat<<USAGE_DOC
-  doc               Compile code documentation (requires Doxygen)
-USAGE_DOC
-
-    # Print options for building libraries
-cat<<USAGE_LIB
-  lib               Compile statically linked archive lib (.a)
-  libo              Compile statically linked lib (.o)
-  libso             Compile dynamically linked lib (.so)
-  dep               Compile dependency files
-  objects           Compile only
-USAGE_LIB
-
+    wmake -help
     exit 1
 }
 
 
-#------------------------------------------------------------------------------
-# Set WM_NCOMPPROCS to number of cores on local machine
-#------------------------------------------------------------------------------
-
-setWM_NCOMPPROCS()
-{
-    if [ -r /proc/cpuinfo ]
-    then
-        WM_NCOMPPROCS=$(egrep "^processor" /proc/cpuinfo | wc -l)
-    else
-        WM_NCOMPPROCS=1
-    fi
-
-    export WM_NCOMPPROCS
-}
-
-
 #------------------------------------------------------------------------------
 # Parse the arguments and options
 #------------------------------------------------------------------------------
 
-while [ "$#" -gt 0 ]
+fromWmake=
+
+for arg in "$@"
 do
-    case "$1" in
-        # Print help
+    case "$arg" in
         -h | -help)
             usage
+            exit 0
             ;;
-        # Parallel compilation on all cores of local machine
-        -j)
-            setWM_NCOMPPROCS
-            test $# -ge 2 && expr $2 + 1 > /dev/null 2>&1 \
-                && shift && export WM_NCOMPPROCS=$1
-            echo "Compiling enabled on $WM_NCOMPPROCS cores"
+        # Check if called from wmake to avoid recusion
+        -fromWmake)
+            fromWmake="fromWmake"
             ;;
-        # Parallel compilation on specified number of cores
-        -j*)
-            export WM_NCOMPPROCS=${1#-j}
-            echo "Compiling enabled on $WM_NCOMPPROCS cores"
-            ;;
-        # Non-stop compilation, ignoring errors
-        -k | -non-stop)
-            export WM_CONTINUE_ON_ERROR=1
-            ;;
-        # Disable scheduled parallel compilation
-        -no-scheduler)
-            unset WM_SCHEDULER
-            ;;
-        # Meant to be used following a pull, this will:
-        # - remove dep files that depend on deleted files;
-        # - remove stale dep files;
-        # - update lnInclude directories;
-        # - remove empty directories, along with deprecated object directories
-        #   and respective binaries.
-        -update)
-            wrmdep -update
-            wrmdep -old
-            wmakeLnIncludeAll
-            wclean empty
-
-            # Set WM_UPDATE_DEPENDENCIES, so that wmake will pick up on it
-            export WM_UPDATE_DEPENDENCIES=yes
-            ;;
-        # Generate documentation
-        doc)
-            test -n "$genDoc" || usage "invalid option '$1'"
-            genDoc=1
-            ;;
-        # Specify target type
+        # Target type
         lib | libo | libso | dep | objects)
-            targetType=$1
-            ;;
-        --)
-            shift
-            break
-            ;;
-        -* | *)
-            usage "invalid option '$1'"
+            targetType=$arg
             ;;
     esac
-    shift
 done
 
 
+#------------------------------------------------------------------------------
+# Execute wmake -all if not called from wmake
+#------------------------------------------------------------------------------
+
+if [ -z "$fromWmake" ]
+then
+    wmake -all $*
+fi
+
+
 #------------------------------------------------------------------------------
 # If WM_CONTINUE_ON_ERROR not set activate the shell option "stop on error"
 #------------------------------------------------------------------------------
@@ -172,7 +102,7 @@ fi
 # Cleanup local variables and functions
 #------------------------------------------------------------------------------
 
-unset Script usage setWM_NCOMPPROCS
+unset Script usage fromWmake
 
 
 #------------------------------------------------------------------------------