Merge pull request #12 from uyjulian/buildsystem_improve

Buildsystem improvements

Author: uyjulian

.github/workflows/compilation.yml

@@ -5,43 +5,58 @@ on:
   pull_request:
   repository_dispatch:
     types: [run_build, run_release]
+  workflow_dispatch: {}
 
 jobs:
   build:
     runs-on: ${{ matrix.os[0] }}
     strategy:
       matrix:
         os: [[macos-latest, bash], [ubuntu-latest, bash], [windows-latest, msys2]]
+      fail-fast: false
     defaults:
      run:
       shell: ${{ matrix.os[1] }} {0}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
 
-    - name: Install Ubuntu texinfo bison flex
+    - name: Install Ubuntu packages
       if: matrix.os[0] == 'ubuntu-latest'
       run: |
         sudo apt-get update
-        sudo apt-get -y install texinfo bison flex gettext
+        sudo apt-get -y install texinfo bison flex gettext libgmp3-dev libmpfr-dev libmpc-dev
+        echo "MSYSTEM=x64" >> $GITHUB_ENV
 
-    - name: Install Mac texinfo bison flex
-      if: matrix.os[0] == 'macOS-latest'
+    - name: Install macOS packages
+      if: matrix.os[0] == 'macos-latest'
       run: |
         brew update
-        brew install texinfo bison flex
+        brew install texinfo bison flex gnu-sed gsl gmp mpfr libmpc
+        echo "MSYSTEM=x64" >> $GITHUB_ENV
 
-    - name: Install MSYS2 texinfo bison flex
+    - name: Install MSYS2 packages
       if: matrix.os[0] == 'windows-latest'
       uses: msys2/setup-msys2@v2
       with:
         msystem: MINGW32
-        install: git make texinfo flex bison patch binutils mingw-w64-i686-gcc
+        install: |
+          base-devel git make texinfo flex bison patch binutils mingw-w64-i686-gcc mpc-devel tar
+          mingw-w64-i686-cmake mingw-w64-i686-extra-cmake-modules mingw-w64-i686-make mingw-w64-i686-libogg
         update: true
         shell: msys2 {0}
 
     - name: Runs all the stages in the shell
+      continue-on-error: false
       run: |
         export PS2DEV=$PWD/ps2dev
         export PATH=$PATH:$PS2DEV/dvp/bin
         ./toolchain.sh
+
+    - name: Print version of executables
+      run: |
+        export PS2DEV=$PWD/ps2dev
+        export PATH=$PATH:$PS2DEV/dvp/bin
+        dvp-as --version

config/ps2toolchain-dvp-config.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+PS2TOOLCHAIN_DVP_BINUTILS_REPO_URL="https://github.com/ps2dev/binutils-gdb.git"
+PS2TOOLCHAIN_DVP_BINUTILS_DEFAULT_REPO_REF="dvp-v2.14"
+
+if test -f "$PS2DEV_CONFIG_OVERRIDE"; then
+  source "$PS2DEV_CONFIG_OVERRIDE"
+fi

scripts/001-binutils.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# binutils-2.14.sh by Francisco Javier Trujillo Mata ([email protected])
+# 001-binutils.sh by ps2dev developers
 
 ## Exit with code 1 when any command executed returns a non-zero exit code.
 onerr()
@@ -8,17 +8,28 @@ onerr()
 }
 trap onerr ERR
 
+## Read information from the configuration file.
+source "$(dirname "$0")/../config/ps2toolchain-dvp-config.sh"
+
 ## Download the source code.
-REPO_URL="https://github.com/ps2dev/binutils-gdb.git"
-REPO_FOLDER="binutils-gdb"
-BRANCH_NAME="dvp-v2.14"
+REPO_URL="$PS2TOOLCHAIN_DVP_BINUTILS_REPO_URL"
+REPO_REF="$PS2TOOLCHAIN_DVP_BINUTILS_DEFAULT_REPO_REF"
+REPO_FOLDER="$(s="$REPO_URL"; s=${s##*/}; printf "%s" "${s%.*}")"
+
+# Checking if a specific Git reference has been passed in parameter $1
+if test -n "$1"; then
+  REPO_REF="$1"
+  printf 'Using specified repo reference %s\n' "$REPO_REF"
+fi
+
 if test ! -d "$REPO_FOLDER"; then
-  git clone --depth 1 -b "$BRANCH_NAME" "$REPO_URL"
+  git clone --depth 1 -b "$REPO_REF" "$REPO_URL" "$REPO_FOLDER"
 else
   git -C "$REPO_FOLDER" fetch origin
-  git -C "$REPO_FOLDER" reset --hard "origin/${BRANCH_NAME}"
-  git -C "$REPO_FOLDER" checkout "$BRANCH_NAME"
+  git -C "$REPO_FOLDER" reset --hard "origin/$REPO_REF"
+  git -C "$REPO_FOLDER" checkout "$REPO_REF"
 fi
+
 cd "$REPO_FOLDER"
 
 TARGET_ALIAS="dvp"