Changeset 3e828ea in mainline for tools/travis.sh

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

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

tools/travis.sh

@@ -52 +52 @@
 arm32/integratorcp:arm-helenos:image.boot
 arm32/raspberrypi:arm-helenos:uImage.bin
+arm64/virt:aarch64-helenos:image.iso
 ia32:i686-helenos:image.iso
 ia64/i460GX:ia64-helenos:image.boot
@@ -86 +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
@@ -153 +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
@@ -185 +198 @@
             ) >hsct.conf || exit 1
 
-            "$HOME/helenos-harbours/hsct.sh" init "$H_HELENOS_HOME" || exit 1
+            "$HOME/helenos-harbours/hsct.sh" init "$H_HELENOS_HOME" $H_ARCH || exit 1
 
             # We cannot flood the output as Travis has limit of maximum output size