mirror of
https://github.com/gnustep/tools-make.git
synced 2025-06-01 09:42:00 +00:00
Windows MSVC debug symbols, gnustep-tests extension, and typo fixes (#30)
* Conditionally add PDB Debug Info on Windows MSVC * Add make debug and no-silent options * Update gnustep-tests help prompt
This commit is contained in:
parent
f0e00360a2
commit
5ee21206a8
3 changed files with 32 additions and 15 deletions
|
@ -49,6 +49,9 @@ export GSTESTDIR
|
||||||
|
|
||||||
GSTESTMODE=normal
|
GSTESTMODE=normal
|
||||||
|
|
||||||
|
GSMAKEOPTIONS="debug=yes"
|
||||||
|
GSVERBOSECFLAG=
|
||||||
|
|
||||||
# Argument checking
|
# Argument checking
|
||||||
while test $# != 0
|
while test $# != 0
|
||||||
do
|
do
|
||||||
|
@ -60,6 +63,12 @@ do
|
||||||
--debug)
|
--debug)
|
||||||
GSTESTDBG="$GSTESTDIR/gdb.cmds"
|
GSTESTDBG="$GSTESTDIR/gdb.cmds"
|
||||||
;;
|
;;
|
||||||
|
--make-debug)
|
||||||
|
GSMAKEOPTIONS+=" --debug"
|
||||||
|
;;
|
||||||
|
--make-no-silent)
|
||||||
|
GSMAKEOPTIONS+=" --no-silent"
|
||||||
|
;;
|
||||||
--developer)
|
--developer)
|
||||||
GSTESTDEV=yes
|
GSTESTDEV=yes
|
||||||
;;
|
;;
|
||||||
|
@ -82,6 +91,8 @@ do
|
||||||
;;
|
;;
|
||||||
--verbose)
|
--verbose)
|
||||||
GSVERBOSE=yes
|
GSVERBOSE=yes
|
||||||
|
GSMAKEOPTIONS+=" messages=yes"
|
||||||
|
GSVERBOSECFLAG="-v"
|
||||||
;;
|
;;
|
||||||
--failfast)
|
--failfast)
|
||||||
GSTESTMODE=failfast
|
GSTESTMODE=failfast
|
||||||
|
@ -95,7 +106,9 @@ do
|
||||||
echo "Use 'gnustep-tests --documentation' for full details."
|
echo "Use 'gnustep-tests --documentation' for full details."
|
||||||
echo "Use 'gnustep-tests --clean' to remove old logs and leftover files."
|
echo "Use 'gnustep-tests --clean' to remove old logs and leftover files."
|
||||||
echo "Use 'gnustep-tests --failfast' to stop after the first failure."
|
echo "Use 'gnustep-tests --failfast' to stop after the first failure."
|
||||||
echo "Use 'gnustep-tests --debug' to run gdb for any failed tests."
|
echo "Use 'gnustep-tests --debug' to run gdb/lldb for any failed tests."
|
||||||
|
echo "Use 'gnustep-tests --make-debug' to enable make debug output."
|
||||||
|
echo "Use 'gnustep-tests --make-no-silent' to disable silent make output."
|
||||||
echo "Use 'gnustep-tests --developer' to treat hopes as real tests."
|
echo "Use 'gnustep-tests --developer' to treat hopes as real tests."
|
||||||
echo "Use 'gnustep-tests --verbose' for full/detailed log output."
|
echo "Use 'gnustep-tests --verbose' for full/detailed log output."
|
||||||
echo "Use 'gnustep-tests --sequential' to disable parallel building."
|
echo "Use 'gnustep-tests --sequential' to disable parallel building."
|
||||||
|
@ -350,23 +363,19 @@ build_test ()
|
||||||
tmp=`basename $TESTFILE .c`
|
tmp=`basename $TESTFILE .c`
|
||||||
if test x"$tmp" = x"$TESTFILE"
|
if test x"$tmp" = x"$TESTFILE"
|
||||||
then
|
then
|
||||||
BUILD_CMD="$CXX -o ./obj/$TESTNAME $TESTFILE $ADDITIONAL_CXXFLAGS $ADDITIONAL_LDFLAGS"
|
BUILD_CMD="$CXX -o $GSVERBOSECFLAG ./obj/$TESTNAME $TESTFILE $ADDITIONAL_CXXFLAGS $ADDITIONAL_LDFLAGS"
|
||||||
else
|
else
|
||||||
BUILD_CMD="$CC -o ./obj/$TESTNAME $TESTFILE $ADDITIONAL_CFLAGS $ADDITIONAL_LDFLAGS"
|
BUILD_CMD="$CC -o $GSVERBOSECFLAG ./obj/$TESTNAME $TESTFILE $ADDITIONAL_CFLAGS $ADDITIONAL_LDFLAGS"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
BUILD_CMD="$OBJCXX -o ./obj/$TESTNAME $TESTFILE $GSTESTFLAGS $GSTESTLIBS"
|
BUILD_CMD="$OBJCXX -o $GSVERBOSECFLAG ./obj/$TESTNAME $TESTFILE $GSTESTFLAGS $GSTESTLIBS"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
BUILD_CMD="$CC -o ./obj/$TESTNAME $TESTFILE $GSTESTFLAGS $GSTESTLIBS"
|
BUILD_CMD="$CC -o $GSVERBOSECFLAG ./obj/$TESTNAME $TESTFILE $GSTESTFLAGS $GSTESTLIBS"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if test x"$GSVERBOSE" = xyes
|
echo $GSMAKEOPTIONS
|
||||||
then
|
BUILD_CMD="$MAKE_CMD $GSMAKEOPTIONS $TESTNAME"
|
||||||
BUILD_CMD="$MAKE_CMD messages=yes debug=yes $TESTNAME"
|
|
||||||
else
|
|
||||||
BUILD_CMD="$MAKE_CMD debug=yes $TESTNAME"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Redirect errors to stdout so it shows up in the log,
|
# Redirect errors to stdout so it shows up in the log,
|
||||||
|
@ -716,9 +725,9 @@ ${tmp}_OBJC_FILES=$TESTFILE"
|
||||||
echo "Building in $dir" >>$GSTESTLOG
|
echo "Building in $dir" >>$GSTESTLOG
|
||||||
if test -r ./make-check.env
|
if test -r ./make-check.env
|
||||||
then
|
then
|
||||||
( . ./make-check.env; . ./TestInfo > /dev/null 2>&1; $MAKE_CMD -j 4 debug=yes) >>$GSTESTLOG 2>&1
|
( . ./make-check.env; . ./TestInfo > /dev/null 2>&1; $MAKE_CMD -j 4 $GSMAKEOPTIONS) >>$GSTESTLOG 2>&1
|
||||||
else
|
else
|
||||||
( . ./TestInfo > /dev/null 2>&1; $MAKE_CMD -j 4 debug=yes) >>$GSTESTLOG 2>&1
|
( . ./TestInfo > /dev/null 2>&1; $MAKE_CMD -j 4 $GSMAKEOPTIONS) >>$GSTESTLOG 2>&1
|
||||||
fi
|
fi
|
||||||
build_state=$?
|
build_state=$?
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -11,7 +11,7 @@ AC_DEFUN([GS_CHECK_ABI20_LINKER], [dnl
|
||||||
AC_REQUIRE([AC_PROG_CC])
|
AC_REQUIRE([AC_PROG_CC])
|
||||||
AC_REQUIRE([AC_PROG_GREP])
|
AC_REQUIRE([AC_PROG_GREP])
|
||||||
AC_CACHE_CHECK([for an gnustep-2.0 ABI compatible linker],[gs_cv_abi20_linker], [dnl
|
AC_CACHE_CHECK([for an gnustep-2.0 ABI compatible linker],[gs_cv_abi20_linker], [dnl
|
||||||
gs_cv_abi20_linker="unkown"
|
gs_cv_abi20_linker="unknown"
|
||||||
AS_VAR_PUSHDEF([LD], [gs_cv_abi20_linker_prog])
|
AS_VAR_PUSHDEF([LD], [gs_cv_abi20_linker_prog])
|
||||||
LD=$($CC --print-prog-name=ld)
|
LD=$($CC --print-prog-name=ld)
|
||||||
if $LD --version | $GREP -q 'GNU ld'; then
|
if $LD --version | $GREP -q 'GNU ld'; then
|
||||||
|
|
|
@ -46,6 +46,14 @@ endif
|
||||||
INTERNAL_CFLAGS = -pthread
|
INTERNAL_CFLAGS = -pthread
|
||||||
INTERNAL_OBJCFLAGS = -pthread
|
INTERNAL_OBJCFLAGS = -pthread
|
||||||
INTERNAL_LDFLAGS =
|
INTERNAL_LDFLAGS =
|
||||||
|
|
||||||
|
ifeq ($(debug), yes)
|
||||||
|
# Embed PDB Debug Info on Windows MSVC
|
||||||
|
ifeq ($(findstring windows, $(GNUSTEP_TARGET_OS)), windows)
|
||||||
|
INTERNAL_LDFLAGS += -Wl,-debug
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifneq ($(findstring android, $(GNUSTEP_TARGET_OS)), android)
|
ifneq ($(findstring android, $(GNUSTEP_TARGET_OS)), android)
|
||||||
ifneq ($(GNUSTEP_TARGET_OS), windows)
|
ifneq ($(GNUSTEP_TARGET_OS), windows)
|
||||||
INTERNAL_LDFLAGS = -pthread
|
INTERNAL_LDFLAGS = -pthread
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue