Skip to content

Commit a5837b7

Browse files
committed
configure: Decrease verbosity of script
Signed-off-by: Lars Erik Wik <[email protected]>
1 parent 71abcf0 commit a5837b7

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

build-scripts/configure

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh -x
1+
#!/bin/sh
22

33

44
. "$(dirname "$0")"/functions
@@ -14,7 +14,7 @@ case "$PROJECT" in
1414
NOVA=yes
1515
;;
1616
*)
17-
fatal "Unknown project: $PROJECT"
17+
fatal "$(basename "$0"): Unknown project: $PROJECT"
1818
;;
1919
esac
2020

@@ -57,7 +57,7 @@ case "$ROLE" in
5757
var_append ARGS "--without-cfmod --without-postgresql"
5858
;;
5959
*)
60-
fatal "Unknown ROLE: $ROLE"
60+
fatal "$(basename "$0"): Unknown ROLE: $ROLE"
6161
;;
6262
esac
6363

@@ -97,7 +97,7 @@ case "$BUILD_TYPE" in
9797
CFLAGS="-g2 -O1 $CFLAGS"
9898
;;
9999
*)
100-
echo "Unknown build type: $BUILD_TYPE"
100+
echo "$(basename "$0"): Error: Unknown build type: $BUILD_TYPE"
101101
exit 42
102102
;;
103103
esac
@@ -107,16 +107,19 @@ then
107107
export PKG_CONFIG_PATH="$BUILDPREFIX/lib/pkgconfig"
108108
fi
109109

110-
111-
( cd "$BASEDIR"/core && env "$OPTS" CFLAGS="$CFLAGS" ./configure "$ARGS" )
110+
echo "$(basename "$0"): Debug: running configure on core repo..."
111+
( cd "$BASEDIR"/core && env "$OPTS" CFLAGS="$CFLAGS" run_and_print_on_failure ./configure "$ARGS" )
112112

113113
if [ "$NOVA" = yes ]
114114
then
115-
( cd "$BASEDIR"/enterprise && env "$OPTS" CFLAGS="$CFLAGS" ./configure "$ARGS" )
115+
echo "$(basename "$0"): Debug: running configure on enterprise repo..."
116+
( cd "$BASEDIR"/enterprise && env "$OPTS" CFLAGS="$CFLAGS" run_and_print_on_failure ./configure "$ARGS" )
116117
if [ "$ROLE" = hub ]
117118
then
118-
( cd "$BASEDIR"/nova && env "$OPTS" CFLAGS="$CFLAGS" ./configure "$ARGS" )
119+
echo "$(basename "$0"): Debug: running configure on hub repo..."
120+
( cd "$BASEDIR"/nova && env "$OPTS" CFLAGS="$CFLAGS" run_and_print_on_failure ./configure "$ARGS" )
119121
fi
120122
fi
121123

122-
( cd "$BASEDIR"/masterfiles && env "$OPTS" CFLAGS="$CFLAGS" ./configure "$ARGS" )
124+
echo "$(basename "$0"): Debug: running configure on masterfiles repo..."
125+
( cd "$BASEDIR"/masterfiles && env "$OPTS" CFLAGS="$CFLAGS" run_and_print_on_failure ./configure "$ARGS" )

0 commit comments

Comments
 (0)