diff options
author | marha <marha@users.sourceforge.net> | 2010-03-07 16:00:29 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-03-07 16:00:29 +0000 |
commit | b40894093babb10f3cd155f11ff2d6c710372395 (patch) | |
tree | e6e94e5aa39ca9d5a653af567145e4b5dda25d61 /mesalib/bin/confdiff.sh | |
parent | d27419efcdaaccb40e0f10c549a6b732a2f29e81 (diff) | |
parent | 14b1cb8d5a27ec9716d3f790fce95f0469e35605 (diff) | |
download | vcxsrv-b40894093babb10f3cd155f11ff2d6c710372395.tar.gz vcxsrv-b40894093babb10f3cd155f11ff2d6c710372395.tar.bz2 vcxsrv-b40894093babb10f3cd155f11ff2d6c710372395.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/bin/confdiff.sh')
-rw-r--r-- | mesalib/bin/confdiff.sh | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/mesalib/bin/confdiff.sh b/mesalib/bin/confdiff.sh deleted file mode 100644 index 568fcd6d5..000000000 --- a/mesalib/bin/confdiff.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -e - -usage() -{ - echo "Usage: $0 <target1> <target2>" - echo "Highlight differences between Mesa configs" - echo "Example:" - echo " $0 linux linux-x86" -} - -die() -{ - echo "$@" >&2 - return 1 -} - -case "$1" in --h|--help) usage; exit 0;; -esac - -[ $# -lt 2 ] && die 2 targets needed. See $0 --help -target1=$1 -target2=$2 - -topdir=$(cd "`dirname $0`"/..; pwd) -cd "$topdir" - -[ -f "./configs/$target1" ] || die Missing configs/$target1 -[ -f "./configs/$target2" ] || die Missing configs/$target2 - -trap 'rm -f "$t1" "$t2"' 0 - -t1=$(mktemp) -t2=$(mktemp) - -make -f- -n -p <<EOF | sed '/^# Not a target/,/^$/d' > $t1 -TOP = . -include \$(TOP)/configs/$target1 -default: -EOF - -make -f- -n -p <<EOF | sed '/^# Not a target/,/^$/d' > $t2 -TOP = . -include \$(TOP)/configs/$target2 -default: -EOF - -diff -pu -I'^#' $t1 $t2 |