Changeset 32b4302 in mainline for tools/travis.sh

Timestamp:

2019-08-18T19:06:02Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1c39d33b

Parents:

fa70134 (diff), 6c2fac18 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-18 19:06:02)

git-committer:

GitHub <noreply@…> (2019-08-18 19:06:02)

Message:

Merge pull request #174 from le-jzr/meson3

Convert HelenOS build system to Meson

File:

• tools/travis.sh (modified) (2 diffs)

tools/travis.sh

@@ -87 +87 @@
     echo "Will try to run C style check."
     echo
-    make ccheck || exit 1
+    cd tools
+    ./build-ccheck.sh || exit 1
+    cd ..
+    tools/ccheck.sh || exit 1
     echo "C style check passed."
     exit 0
@@ -154 +157 @@
     fi
 
-
     # Build it
-    make "PROFILE=$H_ARCH" HANDS_OFF=y || exit 1
-    test -s "$H_OUTPUT_FILENAME" || exit 1
+    SRCDIR="$PWD"
+
+    mkdir -p build/$H_ARCH || exit 1
+    cd build/$H_ARCH
+
+    export PATH="/usr/local/cross/bin:$PATH"
+
+    $SRCDIR/configure.sh $H_ARCH || exit 1
+    ninja || exit 1
+    ninja image_path || exit 1
+
+    cd $SRCDIR
 
     echo