[PATCH modular] Remove "lib only" option from build.sh.

Peter Hutterer peter.hutterer at who-t.net
Tue Nov 23 14:05:23 PST 2010


On Tue, Nov 23, 2010 at 02:40:42PM -0500, Trevor Woerner wrote:
> From: Trevor Woerner <twoerner at gmail.com>
> 
> Now that a user of build.sh has the ability to pick and choose which
> subprojects to process via the --modfile option, having an option
> to only build libraries is redundant.
> 
> Signed-off-by: Trevor Woerner <twoerner at gmail.com>
> ---
> 
> I acknowledge that some people will, rightly so, not agree with this patch
> since -l is an existing option which I am suggesting be removed. But since
> the newer --modfile option is more flexible and fully encompasses the -l
> functionality I see this as a nice, reasonable, cleanup.


I think the use-case of someone only building the libraries is rather
limited anyway, it's probably more common to build server+drivers.

btw, is there a chance you can post some "best practices" for using build.sh
on the wiki? I've long lost track of the many additions to build.sh, having
a wiki site with a few examples on how to build bits or pieces would be
really handy.
 
Cheers,
  Peter

>  build.sh |   23 ++++++++---------------
>  1 files changed, 8 insertions(+), 15 deletions(-)
> 
> diff --git a/build.sh b/build.sh
> index 6a38635..a0a1955 100755
> --- a/build.sh
> +++ b/build.sh
> @@ -952,7 +952,6 @@ usage() {
>      echo "  -d : run make distcheck in addition to others"
>      echo "  -g : build with debug information"
>      echo "  -h | --help : display this help and exit successfully"
> -    echo "  -l : build libraries only (i.e. no drivers, no docs, etc.)"
>      echo "  -n : do not quit after error; just print error message"
>      echo "  -o module/component : build just this component"
>      echo "  -p : run git pull on each component"
> @@ -972,7 +971,6 @@ usage() {
>  HAVE_ARCH="`uname -i`"
>  DIR_ARCH=""
>  DIR_CONFIG="."
> -LIB_ONLY=0
>  PREFIX=""
>  
>  # perform sanity checks on cmdline args which require arguments
> @@ -1039,9 +1037,6 @@ do
>      -L)
>  	LISTONLY=1
>  	;;
> -    -l)
> -	LIB_ONLY=1
> -	;;
>      -n)
>  	NOQUIT=1
>  	;;
> @@ -1164,16 +1159,14 @@ if [ X"$MODFILE" = X ]; then
>      build_lib
>      build_mesa
>  
> -    if [ $LIB_ONLY -eq 0 ]; then
> -	build_doc
> -	build data bitmaps
> -	build_app
> -	build_xserver
> -	build_driver
> -	build_data
> -	build_font
> -	build_util
> -    fi
> +    build_doc
> +    build data bitmaps
> +    build_app
> +    build_xserver
> +    build_driver
> +    build_data
> +    build_font
> +    build_util
>  else
>      process_module_file
>  fi
> -- 
> 1.7.3.2.245.g03276


More information about the xorg-devel mailing list