1
- #! /bin/sh -x
1
+ #! /bin/sh
2
2
3
3
4
4
. " $( dirname " $0 " ) " /functions
@@ -14,7 +14,7 @@ case "$PROJECT" in
14
14
NOVA=yes
15
15
;;
16
16
* )
17
- fatal " Unknown project: $PROJECT "
17
+ fatal " $( basename " $0 " ) : Unknown project: $PROJECT "
18
18
;;
19
19
esac
20
20
@@ -57,7 +57,7 @@ case "$ROLE" in
57
57
var_append ARGS " --without-cfmod --without-postgresql"
58
58
;;
59
59
* )
60
- fatal " Unknown ROLE: $ROLE "
60
+ fatal " $( basename " $0 " ) : Unknown ROLE: $ROLE "
61
61
;;
62
62
esac
63
63
@@ -97,7 +97,7 @@ case "$BUILD_TYPE" in
97
97
CFLAGS=" -g2 -O1 $CFLAGS "
98
98
;;
99
99
* )
100
- echo " Unknown build type: $BUILD_TYPE "
100
+ echo " $( basename " $0 " ) : Error: Unknown build type: $BUILD_TYPE "
101
101
exit 42
102
102
;;
103
103
esac
@@ -107,16 +107,19 @@ then
107
107
export PKG_CONFIG_PATH=" $BUILDPREFIX /lib/pkgconfig"
108
108
fi
109
109
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 " )
112
112
113
113
if [ " $NOVA " = yes ]
114
114
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 " )
116
117
if [ " $ROLE " = hub ]
117
118
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 " )
119
121
fi
120
122
fi
121
123
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