Merge pull request #31 from kokkiemouse/ninja-build

Use Ninja build

Author: mineyoshikawasnow

Dockerfile

@@ -2,4 +2,4 @@
 #   SPDX-License-Identifier: BSD-2-Clause
 
 FROM kdeneon/all:user
-RUN sudo apt-get update && sudo apt-get -y install build-essential cmake extra-cmake-modules gettext kio-dev libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5iconthemes-dev libkf5parts-dev libkf5service-dev libkf5solid-dev libkpmcore-dev libparted-dev libpolkit-qt5-1-dev libqt5svg5-dev libqt5webkit5-dev libyaml-cpp-dev os-prober pkg-config python3-dev qtbase5-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools
+RUN sudo apt update && sudo apt -y install build-essential cmake extra-cmake-modules gettext kio-dev libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5iconthemes-dev libkf5parts-dev libkf5service-dev libkf5solid-dev libkpmcore-dev libparted-dev libpolkit-qt5-1-dev libqt5svg5-dev libqt5webkit5-dev libyaml-cpp-dev os-prober pkg-config python3-dev qtbase5-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools ninja-build

ci/AppImage.sh

@@ -64,7 +64,7 @@
 ### END USAGE
 
 TOOLS_DIR="."
-CMAKE_ARGS=""
+CMAKE_ARGS="-GNinja"
 DO_REBUILD="true"
 DO_CONDA="false"
 CONFIG_DIR=""
@@ -182,17 +182,17 @@ if $DO_REBUILD ; then
         cd "$BUILD_DIR/build" &&
         cmake "$SRC_DIR" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib $CMAKE_ARGS
     ) >> "$LOG_FILE" 2>&1 || { tail -10 "$LOG_FILE" ; echo "! Could not run CMake"; exit 1; }
-    echo "# Running make ..."
+    echo "# Running ninja ..."
     (
         cd "$BUILD_DIR/build" &&
-        make -j4
-    ) >> "$LOG_FILE" 2>&1 || { tail -10 "$LOG_FILE" ; echo "! Could not run make"; exit 1; }
+        ninja -j4
+    ) >> "$LOG_FILE" 2>&1 || { tail -10 "$LOG_FILE" ; echo "! Could not run ninja"; exit 1; }
 fi
-echo "# Running make install ..."
+echo "# Running ninja install ..."
 (
     cd "$BUILD_DIR/build" &&
-    make install DESTDIR=../AppDir
-) >> "$LOG_FILE" 2>&1 || { tail -10 "$LOG_FILE" ; echo "! Could not run make install"; exit 1; }
+     DESTDIR=../AppDir ninja install
+) >> "$LOG_FILE" 2>&1 || { tail -10 "$LOG_FILE" ; echo "! Could not run ninja install"; exit 1; }
 
 ### Modify installation
 #

ci/RELEASE.sh

@@ -80,8 +80,8 @@ BUILDDIR=$(mktemp -d --suffix=-build --tmpdir=.)
 if test "x$BUILD_DEFAULT" = "xtrue" ; then
     rm -rf "$BUILDDIR"
     mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; }
-    ( cd "$BUILDDIR" && cmake .. && make -j4 ) || { echo "Could not perform test-build in $BUILDDIR." ; exit 1 ; }
-    ( cd "$BUILDDIR" && make test ) || { echo "Tests failed in $BUILDDIR ." ; exit 1 ; }
+    ( cd "$BUILDDIR" && cmake -GNinja .. && ninja -j4 ) || { echo "Could not perform test-build in $BUILDDIR." ; exit 1 ; }
+    ( cd "$BUILDDIR" && ninja test ) || { echo "Tests failed in $BUILDDIR ." ; exit 1 ; }
 fi
 
 ### Build with clang
@@ -92,8 +92,8 @@ if test "x$BUILD_CLANG" = "xtrue" ; then
         # Do build again with clang
         rm -rf "$BUILDDIR"
         mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; }
-        ( cd "$BUILDDIR" && CC=clang CXX=clang++ cmake .. && make -j4 ) || { echo "Could not perform test-build in $BUILDDIR." ; exit 1 ; }
-        ( cd "$BUILDDIR" && make test ) || { echo "Tests failed in $BUILDDIR (clang)." ; exit 1 ; }
+        ( cd "$BUILDDIR" && CC=clang CXX=clang++ cmake -GNinja .. && ninja -j4 ) || { echo "Could not perform test-build in $BUILDDIR." ; exit 1 ; }
+        ( cd "$BUILDDIR" && ninja test ) || { echo "Tests failed in $BUILDDIR (clang)." ; exit 1 ; }
     fi
 fi
 
@@ -109,13 +109,13 @@ else
     # Presumably -B was given; just do the cmake part
     rm -rf "$BUILDDIR"
     mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; }
-    ( cd "$BUILDDIR" && cmake .. ) || { echo "Could not run cmake in $BUILDDIR ." ; exit 1 ; }
+    ( cd "$BUILDDIR" && cmake -GNinja .. ) || { echo "Could not run cmake in $BUILDDIR ." ; exit 1 ; }
 fi
 
 ### Get version number for this release
 #
 #
-V=$( cd "$BUILDDIR" && make show-version | grep ^CALAMARES_VERSION | sed s/^[A-Z_]*=// )
+V=$( cd "$BUILDDIR" && ninja show-version | grep ^CALAMARES_VERSION | sed s/^[A-Z_]*=// )
 test -n "$V" || { echo "Could not obtain version in $BUILDDIR ." ; exit 1 ; }
 
 ### Create signed tag
@@ -142,7 +142,7 @@ TMPDIR=$(mktemp -d --suffix="-calamares-$D")
 test -d "$TMPDIR" || { echo "Could not create tarball-build directory." ; exit 1 ; }
 tar xzf "$TAR_FILE" -C "$TMPDIR" || { echo "Could not unpack tarball." ; exit 1 ; }
 test -d "$TMPDIR/$TAR_V" || { echo "Tarball did not contain source directory." ; exit 1 ; }
-( cd "$TMPDIR/$TAR_V" && cmake . && make -j4 && make test ) || { echo "Tarball build failed in $TMPDIR ." ; exit 1 ; }
+( cd "$TMPDIR/$TAR_V" && cmake -GNinja . && ninja -j4 && ninja test ) || { echo "Tarball build failed in $TMPDIR ." ; exit 1 ; }
 
 ### Cleanup
 #

ci/travis-config.sh

@@ -11,6 +11,6 @@ CMAKE_ARGS="\
   -DCMAKE_BUILD_TYPE=Release \
   -DWEBVIEW_FORCE_WEBKIT=1 \
   -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-  -DWITH_PYTHONQT=OFF"
+  -DWITH_PYTHONQT=OFF -GNinja"
 
 export CMAKE_ARGS

ci/travis-continuous.sh

@@ -26,10 +26,10 @@ df -h
 section "cmake $CMAKE_ARGS $SRCDIR"
 cmake $CMAKE_ARGS $SRCDIR || { echo "! CMake failed" ; exit 1 ; }
 
-section "make"
-make -j2 VERBOSE=1 || { echo "! Make recheck" ; pwd -P ; df -h ; make -j1 VERBOSE=1 ; echo "! Make failed" ; exit 1 ; }
+section "ninja"
+ninja -j2 VERBOSE=1 || { echo "! Ninja recheck" ; pwd -P ; df -h ; ninja -j1 VERBOSE=1 ; echo "! Ninja failed" ; exit 1 ; }
 
-section "make install"
+section "ninja install"
 
 install_debugging() {
 	ls -la $( find "$1" -type f -name '*.so' )
@@ -42,7 +42,7 @@ echo "# Install"
 DESTDIR=/build/INSTALL_ROOT
 mkdir -p "$DESTDIR"
 
-if make install VERBOSE=1 DESTDIR="$DESTDIR" ;
+if DESTDIR="$DESTDIR" ninja install -v  ;
 then
 	echo "# .. install OK"
 	result=true

ci/travis-coverity.sh

@@ -25,7 +25,7 @@ export PATH="$BUILDDIR/coveritytool/bin:$PATH"
 
 echo "# cmake -DCMAKE_BUILD_TYPE=Debug $CMAKE_ARGS $SRCDIR"
 cmake -DCMAKE_BUILD_TYPE=Debug $CMAKE_ARGS $SRCDIR || exit 1
-cov-build --dir cov-int make -j2
+cov-build --dir cov-int ninja -j2
 
 tar caf calamares-ci.tar.xz cov-int