Skip to content

Commit 1e1fc33

Browse files
dwsuseigaw
dwsuse
authored and
igaw
committed
scripts: Use spaces instead of tabs
The build.sh file contains a mix of tabs and spaces, just use spaces consistently. Signed-off-by: Daniel Wagner <[email protected]>
1 parent 97456a4 commit 1e1fc33

1 file changed

Lines changed: 72 additions & 72 deletions

File tree

‎scripts/build.sh‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ usage() {
88
echo ""
99
echo "CI build script."
1010
echo ""
11-
echo " -b [release]|debug build type"
12-
echo " -c [gcc]|clang compiler to use"
13-
echo " -m [meson]|muon use meson or muon"
11+
echo " -b [release]|debug build type"
12+
echo " -c [gcc]|clang compiler to use"
13+
echo " -m [meson]|muon use meson or muon"
1414
echo ""
1515
echo "configs with meson:"
16-
echo " [default] default settings"
17-
echo " libdbus build with libdbus"
16+
echo " [default] default settings"
17+
echo " libdbus build with libdbus"
1818
echo " static build without any depedencies and static"
19-
echo " fallback download all dependencies"
20-
echo " and build them as shared libaries"
21-
echo " cross_armhf build armhf with a cross compiler"
22-
echo " cross_ppc64le build ppc64le with a cross compiler"
19+
echo " fallback download all dependencies"
20+
echo " and build them as shared libaries"
21+
echo " cross_armhf build armhf with a cross compiler"
22+
echo " cross_ppc64le build ppc64le with a cross compiler"
2323
echo " cross_s390x build s390x with a cross compiler"
2424
echo ""
2525
echo "configs with muon:"
26-
echo " [default] minimal build"
26+
echo " [default] minimal build"
2727
}
2828

2929
BUILDTOOL=meson
@@ -39,12 +39,12 @@ while getopts "b:c:m:" o; do
3939
c)
4040
CC="${OPTARG}"
4141
;;
42-
m)
43-
BUILDTOOL="${OPTARG}"
44-
;;
42+
m)
43+
BUILDTOOL="${OPTARG}"
44+
;;
4545
*)
4646
usage
47-
exit 1
47+
exit 1
4848
;;
4949
esac
5050
done
@@ -57,79 +57,79 @@ cd "$(git rev-parse --show-toplevel)" || exit 1
5757
BUILDDIR="$(pwd)/.build-ci"
5858

5959
config_meson_default() {
60-
CC="${CC}" "${MESON}" setup \
61-
--werror \
62-
--buildtype="${BUILDTYPE}" \
63-
"${BUILDDIR}"
60+
CC="${CC}" "${MESON}" setup \
61+
--werror \
62+
--buildtype="${BUILDTYPE}" \
63+
"${BUILDDIR}"
6464
}
6565

6666
config_meson_libdbus() {
67-
CC="${CC}" "${MESON}" setup \
68-
--werror \
69-
--buildtype="${BUILDTYPE}" \
70-
-Dlibdbus=enabled \
71-
--prefix=/ \
72-
"${BUILDDIR}"
67+
CC="${CC}" "${MESON}" setup \
68+
--werror \
69+
--buildtype="${BUILDTYPE}" \
70+
-Dlibdbus=enabled \
71+
--prefix=/ \
72+
"${BUILDDIR}"
7373
}
7474

7575
config_meson_static() {
76-
CC="${CC}" CFLAGS="${CFLAGS} -static" \
77-
"${MESON}" setup \
78-
--werror \
79-
--buildtype="${BUILDTYPE}" \
80-
--default-library=static \
81-
-Dlibdbus=disabled \
82-
-Dopenssl=disabled \
83-
-Dkeyutils=disabled \
84-
-Dpython=disabled \
85-
"${BUILDDIR}"
76+
CC="${CC}" CFLAGS="${CFLAGS} -static" \
77+
"${MESON}" setup \
78+
--werror \
79+
--buildtype="${BUILDTYPE}" \
80+
--default-library=static \
81+
-Dlibdbus=disabled \
82+
-Dopenssl=disabled \
83+
-Dkeyutils=disabled \
84+
-Dpython=disabled \
85+
"${BUILDDIR}"
8686
}
8787

8888
config_meson_fallback() {
89-
CC="${CC}" "${MESON}" setup \
90-
--werror \
91-
--buildtype="${BUILDTYPE}" \
92-
--wrap-mode=forcefallback \
93-
-Dlibdbus=enabled \
94-
-Ddbus:werror=false \
95-
-Dopenssl:werror=false \
96-
"${BUILDDIR}"
89+
CC="${CC}" "${MESON}" setup \
90+
--werror \
91+
--buildtype="${BUILDTYPE}" \
92+
--wrap-mode=forcefallback \
93+
-Dlibdbus=enabled \
94+
-Ddbus:werror=false \
95+
-Dopenssl:werror=false \
96+
"${BUILDDIR}"
9797
}
9898

9999
config_meson_cross_armhf() {
100-
CC="${CC}" "${MESON}" setup \
101-
--werror \
102-
--buildtype="${BUILDTYPE}" \
100+
CC="${CC}" "${MESON}" setup \
101+
--werror \
102+
--buildtype="${BUILDTYPE}" \
103103
--cross-file=.github/cross/ubuntu-armhf.txt \
104-
-Dpython=disabled \
105-
"${BUILDDIR}"
104+
-Dpython=disabled \
105+
"${BUILDDIR}"
106106
}
107107

108108
config_meson_cross_ppc64le() {
109-
CC="${CC}" "${MESON}" setup \
110-
--werror \
111-
--buildtype="${BUILDTYPE}" \
109+
CC="${CC}" "${MESON}" setup \
110+
--werror \
111+
--buildtype="${BUILDTYPE}" \
112112
--cross-file=.github/cross/ubuntu-ppc64le.txt \
113-
-Dpython=disabled \
114-
"${BUILDDIR}"
113+
-Dpython=disabled \
114+
"${BUILDDIR}"
115115
}
116116

117117
config_meson_cross_s390x() {
118-
CC="${CC}" "${MESON}" setup \
119-
--werror \
120-
--buildtype="${BUILDTYPE}" \
121-
--cross-file=.github/cross/ubuntu-s390x.txt \
122-
-Dpython=disabled \
123-
"${BUILDDIR}"
118+
CC="${CC}" "${MESON}" setup \
119+
--werror \
120+
--buildtype="${BUILDTYPE}" \
121+
--cross-file=.github/cross/ubuntu-s390x.txt \
122+
-Dpython=disabled \
123+
"${BUILDDIR}"
124124
}
125125
build_meson() {
126-
"${MESON}" compile \
127-
-C "${BUILDDIR}"
126+
"${MESON}" compile \
127+
-C "${BUILDDIR}"
128128
}
129129

130130
test_meson() {
131-
"${MESON}" test \
132-
-C "${BUILDDIR}"
131+
"${MESON}" test \
132+
-C "${BUILDDIR}"
133133
}
134134

135135
tools_build_muon() {
@@ -143,11 +143,11 @@ tools_build_muon() {
143143
CC="${CC}" ninja="${SAMU}" ./bootstrap.sh build
144144
BOOTSTRAP_MUON="${BUILDDIR}/build-tools/muon/build/muon"
145145

146-
CC="${CC}" ninja="${SAMU}" ${BOOTSTRAP_MUON} setup \
147-
-Dlibcurl=disabled \
148-
-Dlibarchive=disabled \
149-
-Ddocs=disabled \
150-
-Dsamurai=disabled \
146+
CC="${CC}" ninja="${SAMU}" ${BOOTSTRAP_MUON} setup \
147+
-Dlibcurl=disabled \
148+
-Dlibarchive=disabled \
149+
-Ddocs=disabled \
150+
-Dsamurai=disabled \
151151
"${BUILDDIR}/build-tools/muon-bin"
152152
"${SAMU}" -C "${BUILDDIR}/build-tools/muon-bin"
153153
#"${BOOTSTRAP_MUON}" -C "${BUILDDIR}/build-tools/muon-bin" test
@@ -161,8 +161,8 @@ config_muon_default() {
161161
# Need to explicitly disable python as muon currently
162162
# only partially supports the python module. It misses
163163
# the dependency() implementation
164-
ninja="${SAMU}" "${MUON}" setup \
165-
-Dpython=disabled \
164+
ninja="${SAMU}" "${MUON}" setup \
165+
-Dpython=disabled \
166166
"${BUILDDIR}"
167167
}
168168

@@ -178,10 +178,10 @@ rm -rf "${BUILDDIR}"
178178

179179
if [[ "${BUILDTOOL}" == "muon" ]]; then
180180
if ! which samu || ! which muon ; then
181-
tools_build_muon
181+
tools_build_muon
182182
else
183-
SAMU="$(which samu)"
184-
MUON="$(which muon)"
183+
SAMU="$(which samu)"
184+
MUON="$(which muon)"
185185
fi
186186
fi
187187

0 commit comments

Comments
 (0)