More diagnostics and updated version number processing.

If the branch created had a '/' in it, we would not actually build
properly - the `sed` would crash.

Author: gerph

.github/workflows/ci.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Prerequisites for CentOS 8
         if: matrix.os == 'centos:8'
         run: |
-          echo "Fixing up centos 8 being EOL'd"
+          echo "Fixing up centos 8 being EOLd"
           for i in /etc/yum.repos.d/* ; do sed -i 's/mirrorlist/#mirrorlist/' $i ; done
           for i in /etc/yum.repos.d/* ; do sed -i 's!#baseurl=http://mirror.!baseurl=http://vault.!' $i ; done
 
@@ -92,18 +92,18 @@ jobs:
           crosscompile/setup-riscos-tests.sh
 
           # Zip up the source to send to robuild
-          echo Zip up our sources
+          echo +++ Zip up our sources
           zip -q9r /tmp/source-archive.zip riscos-bits ROTest,feb .robuild.yaml
 
           # Fetch the build client
-          echo Fetch the build client
+          echo +++ Fetch the build client
           curl -s -L -o riscos-build-online https://github.com/gerph/robuild-client/releases/download/v0.05/riscos-build-online && chmod +x riscos-build-online
 
           # Send the archive file to build service (with explicit timeout)
-          echo Run the build
+          echo +++ Run the build
           timeout 660 ./riscos-build-online -i /tmp/source-archive.zip -a off -t 600 -o /tmp/built
 
-          # If it didn't report an error, the test was successful.
+          # If it did not report an error, the test was successful.
 
   export-posix:
     runs-on: ubuntu-24.04

crosscompile/build-riscos-tool.sh

@@ -31,7 +31,7 @@ if [[ -f "${rootdir}/process.pl" ]] ; then
 else
     tool_file="${rootdir}/riscos-prminxml"
 fi
-sed "s/VERSION/$version/" "${rootdir}/riscos-prminxml" > "${install_dir}/riscos-prminxml/riscos-prminxml.pl,102"
+sed "s!VERSION!$version!" "${rootdir}/riscos-prminxml" > "${install_dir}/riscos-prminxml/riscos-prminxml.pl,102"
 cp -R "${rootdir}/catalog" "${install_dir}/riscos-prminxml/catalog"
 cp -R "${rootdir}/Resources/!Run,feb" "${install_dir}/riscos-prminxml/!Run,feb"
 cp -R "${rootdir}/Resources/perl,ff8" "${install_dir}/riscos-prminxml/perl,ff8"

crosscompile/setup-riscos-prereqs.sh

@@ -51,7 +51,7 @@ fi
 source "${scriptdir}/setup-venv.sh"
 
 # Extract them
-source "${venvdir}/bin/activate"
+echo +++ Extracting xml/xslt tools for RISC OS
 riscos-unzip --chdir "${install_dir}" "${download_xml2}"
 mv "${install_dir}/README.md" "${install_dir}/README-libxml2.md"
 mv "${install_dir}/COPYING" "${install_dir}/COPYING-libxml2"

crosscompile/setup-riscos-tests.sh

@@ -20,13 +20,15 @@ if [[ -f "${perlbin}" ]] ; then
 fi
 
 # Obtain XSLTProc and LibXML2
+echo +++ Setting up prerequisites
 "${scriptdir}/setup-riscos-prereqs.sh" "${downloaddir}"
 
 # We don't need the libraries
 rm -rf "${downloaddir}/Lib"
 
 # Put our tool in the top level
 eval "$(${scriptdir}/ci-vars)"
+echo +++ Building RISC OS Tool
 "${scriptdir}/build-riscos-tool.sh" "${downloaddir}"
 
 # Put the examples in there