From 990bc3f015a4f8fce2eb918375defcd44980a845 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 8 Jun 2012 09:33:13 +0200 Subject: Used synchronise script to update files --- mesalib/bin/.gitignore | 7 +++ mesalib/bin/confdiff.sh | 96 +++++++++++++++---------------- mesalib/bin/installmesa | 148 ++++++++++++++++++++++++------------------------ 3 files changed, 129 insertions(+), 122 deletions(-) create mode 100644 mesalib/bin/.gitignore (limited to 'mesalib/bin') diff --git a/mesalib/bin/.gitignore b/mesalib/bin/.gitignore new file mode 100644 index 000000000..2ee67a666 --- /dev/null +++ b/mesalib/bin/.gitignore @@ -0,0 +1,7 @@ +config.guess +config.sub +install-sh +/depcomp +/missing +ylwrap +compile diff --git a/mesalib/bin/confdiff.sh b/mesalib/bin/confdiff.sh index 43df914f3..568fcd6d5 100644 --- a/mesalib/bin/confdiff.sh +++ b/mesalib/bin/confdiff.sh @@ -1,48 +1,48 @@ -#!/bin/bash -e - -usage() -{ - echo "Usage: $0 " - 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 < $t1 -TOP = . -include \$(TOP)/configs/$target1 -default: -EOF - -make -f- -n -p < $t2 -TOP = . -include \$(TOP)/configs/$target2 -default: -EOF - -diff -pu -I'^#' $t1 $t2 +#!/bin/bash -e + +usage() +{ + echo "Usage: $0 " + 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 < $t1 +TOP = . +include \$(TOP)/configs/$target1 +default: +EOF + +make -f- -n -p < $t2 +TOP = . +include \$(TOP)/configs/$target2 +default: +EOF + +diff -pu -I'^#' $t1 $t2 diff --git a/mesalib/bin/installmesa b/mesalib/bin/installmesa index 771fb4fdc..1e24c05ca 100644 --- a/mesalib/bin/installmesa +++ b/mesalib/bin/installmesa @@ -1,74 +1,74 @@ -#!/bin/sh - -# -# Simple shell script for installing Mesa's header and library files. -# If the copy commands below don't work on a particular system (i.e. the -# -f or -d flags), we may need to branch on `uname` to do the right thing. -# - - -TOP=. - -INCLUDE_DIR="/usr/local/include" -LIB_DIR="/usr/local/lib" - -if [ "x$#" = "x0" ] ; then -echo -echo "***** Mesa installation - You may need root privileges to do this *****" -echo -echo "Default directory for header files is:" ${INCLUDE_DIR} -echo "Enter new directory or press to accept this default." - -read INPUT -if [ "x${INPUT}" != "x" ] ; then - INCLUDE_DIR=${INPUT} -fi - -echo -echo "Default directory for library files is:" ${LIB_DIR} -echo "Enter new directory or press to accept this default." - -read INPUT -if [ "x${INPUT}" != "x" ] ; then - LIB_DIR=${INPUT} -fi - -echo -echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL -echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR} -echo "Press to continue, or -C to abort." - -read INPUT - -else -INCLUDE_DIR=$1/include -LIB_DIR=$1/lib -fi - -# flags: -# -f = force -# -d = preserve symlinks (does not work on BSD) - -if [ `uname` = "FreeBSD" ] ; then - CP_FLAGS="-f" -elif [ `uname` = "Darwin" ] ; then - CP_FLAGS="-f" -elif [ `uname` = "AIX" ] ; then - CP_FLAGS="-fh" -else - CP_FLAGS="-fd" -fi - - -set -v - -mkdir -p ${INCLUDE_DIR} -mkdir -p ${INCLUDE_DIR}/GL -# NOT YET: mkdir -p ${INCLUDE_DIR}/GLES -mkdir -p ${LIB_DIR} -cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL -cp -f ${TOP}/src/glw/*.h ${INCLUDE_DIR}/GL -# NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES -cp ${CP_FLAGS} ${TOP}/lib*/lib* ${LIB_DIR} - -echo "Done." +#!/bin/sh + +# +# Simple shell script for installing Mesa's header and library files. +# If the copy commands below don't work on a particular system (i.e. the +# -f or -d flags), we may need to branch on `uname` to do the right thing. +# + + +TOP=. + +INCLUDE_DIR="/usr/local/include" +LIB_DIR="/usr/local/lib" + +if [ "x$#" = "x0" ] ; then +echo +echo "***** Mesa installation - You may need root privileges to do this *****" +echo +echo "Default directory for header files is:" ${INCLUDE_DIR} +echo "Enter new directory or press to accept this default." + +read INPUT +if [ "x${INPUT}" != "x" ] ; then + INCLUDE_DIR=${INPUT} +fi + +echo +echo "Default directory for library files is:" ${LIB_DIR} +echo "Enter new directory or press to accept this default." + +read INPUT +if [ "x${INPUT}" != "x" ] ; then + LIB_DIR=${INPUT} +fi + +echo +echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL +echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR} +echo "Press to continue, or -C to abort." + +read INPUT + +else +INCLUDE_DIR=$1/include +LIB_DIR=$1/lib +fi + +# flags: +# -f = force +# -d = preserve symlinks (does not work on BSD) + +if [ `uname` = "FreeBSD" ] ; then + CP_FLAGS="-f" +elif [ `uname` = "Darwin" ] ; then + CP_FLAGS="-f" +elif [ `uname` = "AIX" ] ; then + CP_FLAGS="-fh" +else + CP_FLAGS="-fd" +fi + + +set -v + +mkdir -p ${INCLUDE_DIR} +mkdir -p ${INCLUDE_DIR}/GL +# NOT YET: mkdir -p ${INCLUDE_DIR}/GLES +mkdir -p ${LIB_DIR} +cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL +cp -f ${TOP}/src/glw/*.h ${INCLUDE_DIR}/GL +# NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES +cp ${CP_FLAGS} ${TOP}/lib*/lib* ${LIB_DIR} + +echo "Done." -- cgit v1.2.3