Skip to content

Commit b0447d5

Browse files
Fix CI directory not found error
1 parent bd5edf1 commit b0447d5

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

scripts/ci_linux.sh

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#!/bin/bash
22
build_dir="build"
3+
qt_build_dir="qt-build"
34

4-
release_flags="-DCMAKE_BUILD_TYPE=Release"
5+
mkdir -p "$qt_build_dir"
56

6-
qt_build_dir="qt-build"
7-
mkdir -p "$qt_src_dir"
8-
qt_static_dir="$(cd "$qt_build_dir" && pwd)/qt-src/qtbase/build/qt-static"
7+
release_flags="-DCMAKE_BUILD_TYPE=Release"
98
qt_src_dir="$qt_build_dir/qt-src"
9+
qt_static_dir="$(cd "$qt_build_dir" && pwd)/qt-src/qtbase/build/qt-static"
1010

1111
opt_flags="-O3 -march=native -flto -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ftree-vectorize -fvisibility=hidden"
1212
nproc=$(nproc)
1313

1414
create_build_dir() {
15-
mkdir $build_dir
15+
mkdir -p "$build_dir" "$qt_build_dir"
1616
}
1717

1818
install_base() {
@@ -23,15 +23,17 @@ install_base() {
2323
}
2424

2525
build_qt_static() {
26+
mkdir -p "$qt_src_dir"
2627
cd "$qt_src_dir" || exit
2728

28-
git clone https://github.com/qt/qt5.git .
29+
git clone https://github.com/qt/qt5.git .
2930
git checkout v6.5.2
3031
perl init-repository -f --module-subset=qtbase
3132

32-
cd qtbase || exit
33+
cd qtbase || exit
34+
mkdir -p build && cd build || exit
3335

34-
./configure -static -release \
36+
../configure -static -release \
3537
-prefix "$qt_static_dir" \
3638
-platform linux-clang \
3739
-opensource -confirm-license \
@@ -46,7 +48,7 @@ build_qt_static() {
4648
}
4749

4850
build_zclipboard() {
49-
cd "$build_dir" || exit
51+
cd "$build_dir" || exit
5052

5153
cmake -G "Ninja" \
5254
-DCMAKE_CXX_COMPILER=clang++ \
@@ -69,7 +71,6 @@ match_options() {
6971
*)
7072
echo "Usage: $0 {install-base |mkdir-build |build-qt |release-build}"
7173
exit 1
72-
7374
esac
7475
}
7576

0 commit comments

Comments
 (0)