gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve reliability

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32205 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-02-18 16:27:22 +00:00
parent 85c411150c
commit 883d7c1ecb
4 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,8 +1,10 @@
2011-01-18 Richard Frith-Macdonald <rfm@gnu.org>
* gnustep-config.in:
* TestFramework/gnustep-tests:
* TestFramework/runtest.sh:
* TestFramework/Summary.sh:
Tweak use of grep for portability
Tweak use of grep for portability. Try to locate gnu make reliably.
2011-01-16 Richard Frith-Macdonald <rfm@gnu.org>

12
TestFramework/gnustep-tests
View file

@ -98,12 +98,16 @@ export GSTESTMODE
if [ ! "$MAKE_CMD" ]
then
gmake --version > /dev/null 2>&1
if [ $? = 0 ]
MAKE_CMD=`gnustep-config --variable=GNUMAKE`
$MAKE_CMD --version > /dev/null 2>&1
if [ $? != 0 ]
then
MAKE_CMD=gmake
else
MAKE_CMD=make
$MAKE_CMD --version > /dev/null 2>&1
if [ $? != 0 ]
then
MAKE_CMD=make
fi
fi
fi
export MAKE_CMD

9
TestFramework/runtest.sh
View file

@ -101,11 +101,16 @@ DIR=`pwd`
if [ ! "$MAKE_CMD" ]
then
MAKE_CMD=gmake
MAKE_CMD=`gnustep-config --variable=GNUMAKE`
$MAKE_CMD --version > /dev/null 2>&1
if [ $? != 0 ]
then
MAKE_CMD=make
MAKE_CMD=gmake
$MAKE_CMD --version > /dev/null 2>&1
if [ $? != 0 ]
then
MAKE_CMD=make
fi
fi
fi

3
gnustep-config.in
View file

@ -59,6 +59,7 @@ if [ "$1" = "--help" ]; then
echo " variable. Here is a list of possible"
echo " variables:"
echo
echo " --variable=GNUMAKE"
echo " --variable=GNUSTEP_MAKEFILES"
echo " --variable=GNUSTEP_USER_DEFAULTS_DIR"
echo " --variable=GNUSTEP_HOST"
@ -152,6 +153,8 @@ export GNUSTEP_MAKEFILES
case "$1" in
--variable=GNUSTEP_MAKEFILES) echo "$GNUSTEP_MAKEFILES"
exit 0;;
--variable=GNUMAKE) echo "@GNUMAKE@"
exit 0;;
--objc-flags) @GNUMAKE@ -s -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-flags quiet=yes 2>/dev/null
exit 0;;
--objc-libs) @GNUMAKE@ -s -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-libs quiet=yes 2>/dev/null