Merge pull request #242 from andrewbird/ci-58

Ci 58

ci_build.sh

@@ -11,7 +11,21 @@ if [ "x${CI}" = "xtrue" ] ; then
 fi
 
 if [ -z "${DIR_INSTALLED_FDPP}" ] ; then
-   echo env var "DIR_INSTALLED_FDPP" is empty or missing
-   exit 1
+  echo env var "DIR_INSTALLED_FDPP" is empty or missing
+  exit 1
+fi
+
+INST=$(pwd)/${DIR_INSTALLED_FDPP}
+
+if false ; then
+  # Old Makefile based build
+  make clean all PREFIX=${INST}
+else
+  # Ubuntu 22.04 has too old a Meson, so pip install it
+  sudo apt install ninja-build pipx
+  pipx install meson
+  export PATH=${HOME}/.local/bin:${PATH}
+
+  PREFIX=${INST} ./configure.meson build
+  meson compile --verbose -C build
 fi
-make clean all PREFIX=`pwd`/${DIR_INSTALLED_FDPP}

ci_setup_test.sh

@@ -20,7 +20,11 @@ DIR_ROOT="$(pwd)"
 git clone --depth 1 --no-single-branch https://github.com/dosemu2/dosemu2.git ${DIR_TEST_DOSEMU}
 
 # Install fdpp into local directory
-make install PREFIX="${DIR_ROOT}/${DIR_INSTALLED_FDPP}"
+if false ; then
+  make install PREFIX="${DIR_ROOT}/${DIR_INSTALLED_FDPP}"
+else
+  meson install -C ${DIR_ROOT}/build
+fi
 
 (
   cd ${DIR_TEST_DOSEMU} || exit 2

configure.meson

@@ -1,20 +1,27 @@
-if [ -f meson.build ]; then
-    echo -e "Create a build dir first:"
-    echo -e "\tmkdir build"
-    echo -e "\tcd build"
-    echo -e "\t../$(basename $0)"
-    echo "Bye!"
-    exit 0
+#!/bin/sh
+
+# set -xv
+
+if [ -z "$1" ] ; then
+    echo "Usage: ./$(basename $0) builddir"
+    exit 1
 fi
+BLD="$1"
 
 TOP=$(dirname "$0")
-meson setup --native-file $TOP/fdpp/toolchain.ini \
+
+if [ -z "${PREFIX}" ] ; then
+    PREFIX="/usr/local"
+fi
+
+meson setup --prefix ${PREFIX} \
+  --native-file $TOP/fdpp/toolchain.ini \
   --cross-file $TOP/fdpp/toolchain.ini \
   --cross-file $TOP/fdpp/kernel/toolchain.ini \
-  --native-file $TOP/fdpp/kernel/toolchain.ini . $TOP
+  --native-file $TOP/fdpp/kernel/toolchain.ini $BLD $TOP
 [ "$?" = "0" ] || exit 1
 
 echo
 echo "Done configure"
-echo "Now run \"meson compile --verbose\" to build"
-echo "After that you can do \"sudo meson install\" to install"
+echo "Now run \"meson compile --verbose -C $BLD\" to build"
+echo "After that you can do \"sudo meson install -C $BLD\" to install"