Merge Develop to master for 4.1.0 release

.github/workflows/doxygen-gh-pages.yml

@@ -1,5 +1,5 @@
 # Nom de notre workflow
-name: PVSNESLIB Build Deploy Documentation
+name: Publish Doxygen documentation
 
 # Événements sur lesquels il doit être déclenché
 on:
@@ -25,27 +25,26 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: develop
-          fetch-depth: 0
           persist-credentials: false
 
-      # 2. Partie spécifique à Sphinx (installation des
-      #    dépendances et génération de la doc)
+      # 2. installation des dépendances et génération de la doc
 
       - name: Install Doxygen
         run: |
           sudo apt-get install doxygen -y
         shell: bash
-      
+
       - name: "Build Doxygen Doc"
         run: |
           cd pvsneslib
-          PVSDOCSDIR="docs" PVSVERSION="4.0.2" doxygen docs/pvsneslib.dox
+          export PVSNESLIB_HOME=`pwd`
+          make docs
         shell: bash
 
       # 3. Déploiement sur les Github Pages
 
       - name: "Deploy Github Pages"
         uses: JamesIves/github-pages-deploy-action@v4
         with:
-          BRANCH: gh-pages     # <- Branche sur laquelle seront commités les fichiers
-          FOLDER: pvsneslib/docs/html/  # <- Dossier contenant notre documentation générée
+          branch: gh-pages     # <- Branche sur laquelle seront commités les fichiers
+          folder: pvsneslib/docs/html/  # <- Dossier contenant notre documentation générée

.github/workflows/pvsneslib_build_package.yml

@@ -1,135 +1,132 @@
-name: PVSNESLIB Build and Package
+name: PVSNESLIB Build & Release
 
+      # ------------------------------------ #
+      # Events to trigger the action         #
+      # ------------------------------------ #
 on:
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-  # Triggers the workflow on push or pull request events but only for the develop branch
-  # push:
-  #   branches: [ develop ]
-
+  push:
+    branches:
+      - "develop"
+
+      # ------------------------------------ #
+      # Set O.S matrix                       #
+      # ------------------------------------ #
 jobs:
   build:
-    runs-on: ${{ matrix.os }}  
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
-            name: Linux-x64
-          - os: windows-2019
-            name: Windows-x32
-    #      - os: macos-11
-    #        name: MacOS-x64
+          - os: ubuntu-latest
+            name: linux
+          - os: windows-latest
+            name: windows
+          - os: macos-latest
+            name: darwin
+
     steps:
-
-      # ==== OS Specific Dependencies ====
-      - name: Install dependencies
-        if: matrix.name == 'Linux-x64'
+      # ------------------------------------ #
+      # Install dependencies                 #
+      # ------------------------------------ #
+      - name: Install dependencies for Linux
+        if: matrix.name == 'linux'
         run: |
-          sudo apt-get install gcc-multilib
-
-      - name: Windows Depends MSYS2/MinGW32
-        if: matrix.name == 'Windows-x32'
+          sudo apt update -y
+          sudo apt-get install -y build-essential \
+              gcc-12 \
+              cmake \
+              make \
+              git \
+              doxygen \
+              texi2html \
+              texlive-latex-base \
+              texlive-latex-recommended \
+              texlive-latex-extra
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 90
+      - name: Install dependencies for Windows
+        if: matrix.name == 'windows'
         uses: msys2/setup-msys2@v2
         with:
-          msystem: MINGW32
-          path-type: minimal #strict
-          release: false
-          update: false
+          update: true
+          msystem: UCRT64
           install: >-
+            mingw-w64-ucrt-x86_64-toolchain
+            mingw-w64-ucrt-x86_64-cmake
+            mingw-w64-ucrt-x86_64-doxygen
+            mingw-w64-ucrt-x86_64-pcre2
             base-devel
-            mingw-w64-i686-toolchain
+            git
+            zip
+      - name: Install dependencies for MacOS
+        if: matrix.name == 'darwin'
+        run: |
+          brew update
+          brew install doxygen
+          brew install gnu-sed
+          brew install texi2html
+          brew install texlive
+          sudo ln -s /usr/local/bin/gcc-12 /usr/local/bin/gcc
+          sudo ln -s /usr/local/bin/g++-12 /usr/local/bin/g++
 
-      # ==== Build Steps ====
+      # ------------------------------------ #
+      # Checkout the project                 #
+      # ------------------------------------ #
       - name: Check out PVSNESLIB
         uses: actions/checkout@v3
         with:
-          ref: develop
-          path: pvsneslib
-          fetch-depth: 0
-          submodules: true
+          ref: ${{ github.head_ref }}
+          submodules: recursive
           persist-credentials: false
-
-      # ==== Pre-Build: Set environment vars ====
-      # Needs to be in a separate step than build so that setting the environment var takes effect
-      #
-      - name: Pre-Build Linux/MacOS
-        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64')
-        shell: bash
-        run: |
-          echo "BUILD_PACKAGE_FILENAME=pvsneslib-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV
 
-      - name: Pre-Build Windows
-        if: (matrix.name == 'Windows-x64') || (matrix.name == 'Windows-x32')
-        shell: bash
+      # ------------------------------------ #
+      # Compiling sources and create release #
+      # ------------------------------------ #
+      - name: Build & Release PVSNESLIB for Linux
+        if: (matrix.name == 'linux')
         run: |
-          echo "BUILD_PACKAGE_FILENAME=pvsneslib-${{ matrix.name }}.zip" >> $GITHUB_ENV
-
-      # ==== Builds ====
-      - name: Build PVSNESLIB Linux/MacOS
-        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64')
-        shell: bash
+          export PVSNESLIB_HOME=$(pwd)
+          make release | tee pvsneslib_release_${{ matrix.name }}.log
+      - name: Build & Release PVSNESLIB for Windows
+        if: (matrix.name == 'windows')
+        shell: msys2 {0}
         run: |
-          cd pvsneslib
-          export PVSNESLIB_HOME=`pwd`
-          make
-          cd ..
-
-      - name: Build PVSNESLIB Windows
-        if: (matrix.name == 'Windows-x64') || (matrix.name == 'Windows-x32')
-        shell: cmd
+          export PVSNESLIB_HOME=$(pwd)
+          make release | tee pvsneslib_release_${{ matrix.name }}.log
+      - name: Build & Release PVSNESLIB for MacOS
+        if: (matrix.name == 'darwin')
         run: |
-          cd pvsneslib
-          #set PVSNESLIB_HOME=%CD% it is D:\a\pvsneslib\pvsneslib\pvsneslib (not working after)
-          set PVSNESLIB_HOME=/d/a/pvsneslib/pvsneslib/pvsneslib
-          echo %PVSNESLIB_HOME%
-          msys2 -c 'make'
-          cd ..
+          export PVSNESLIB_HOME=$(pwd)
+          export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
+          make release | tee pvsneslib_release_${{ matrix.name }}.log
 
-      # ==== Packaging ====
-      - name: Package build Linux/MacOS
-        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64')
-        shell: bash
+      # ------------------------------------ #
+      # Checking libraries linking           #
+      # ------------------------------------ #
+      - name: Checking libraries linking PVSNESLIB toolchain
+        if: matrix.name == 'darwin'
         run: |
-          cd pvsneslib
-          mkdir package
-          mkdir -p package/pvsneslib 
-          mkdir -p package/pvsneslib/pvsneslib
-          cp -r devkitsnes package/pvsneslib
-          cp -r pvsneslib/include package/pvsneslib/pvsneslib
-          cp -r pvsneslib/lib package/pvsneslib/pvsneslib
-          cp -r pvsneslib/pvsneslib_license.txt package/pvsneslib/pvsneslib_license.txt
-          cp -r pvsneslib/pvsneslib_snesmod.txt package/pvsneslib/pvsneslib_snesmod.txt
-          cp -r pvsneslib/pvsneslib_version.txt package/pvsneslib/pvsneslib_version.txt
-          cp -r snes-examples package/pvsneslib/snes-examples
-          cd package
-          tar -czf ${{ env.BUILD_PACKAGE_FILENAME }} pvsneslib
-          cd ..
-          cd ..
-
-      - name: Package build Windows
-        if: (matrix.name == 'Windows-x64') || (matrix.name == 'Windows-x32')
-        shell: cmd
+          otool -L devkitsnes/bin/* devkitsnes/tools/* | tee pvsneslib_toolchain_linking_${{ matrix.name }}.log || true
+      - name: Checking libraries linking PVSNESLIB toolchain
+        if: matrix.name == 'windows' || matrix.name == 'linux'
         run: |
-          cd pvsneslib
-          mkdir package
-          mkdir package\pvsneslib 
-          mkdir package\pvsneslib\pvsneslib
-          cp -r devkitsnes package\pvsneslib
-          cp -r pvsneslib\include package\pvsneslib\pvsneslib
-          cp -r pvsneslib\lib package\pvsneslib\pvsneslib
-          cp -r pvsneslib\pvsneslib_license.txt package\pvsneslib\pvsneslib_license.txt
-          cp -r pvsneslib\pvsneslib_snesmod.txt package\pvsneslib\pvsneslib_snesmod.txt
-          cp -r pvsneslib\pvsneslib_version.txt package\pvsneslib\pvsneslib_version.txt
-          cp -r snes-examples package\pvsneslib\snes-examples
-          cd package
-          7z a ${{ env.BUILD_PACKAGE_FILENAME }} pvsneslib
-          cd ..
-          cd ..
+          ldd devkitsnes/bin/* devkitsnes/tools/* | tee pvsneslib_toolchain_linking_${{ matrix.name }}.log || true
+
+      # ------------------------------------ #
+      # Upload releases                      #
+      # ------------------------------------ #
+      - name: Upload PVSNESLIB release
+        uses: actions/upload-artifact@v3
+        with:
+          name: PVSNESLIB Release for ${{ matrix.name }}
+          path: release/pvsneslib_64b_${{ matrix.name }}.zip
 
-      - name: Store build
-        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-64') || ('Windows-x64') || ('Windows-x32')
+      # ------------------------------------ #
+      # Upload releases                      #
+      # ------------------------------------ #
+      - name: Upload PVSNESLIB logs
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ matrix.name }}-build
-          path: pvsneslib/package/${{ env.BUILD_PACKAGE_FILENAME }}
-          # retention-days: 14
+          name: PVSNESLIB Release Logs for ${{ matrix.name }}
+          path: "*.log"

.gitignore

@@ -15,8 +15,6 @@ release
 # exclude binaries (specific to your OS)
 devkitsnes/tools
 devkitsnes/bin
-# except the python script !
-!devkitsnes/bin/816-opt.py
 
 # everything related to submodules
 compiler/wla-dx
@@ -37,8 +35,10 @@ tools/snestools/snestools
 tools/snestools/snestools.exe
 tools/tmx2snes/tmx2snes
 tools/tmx2snes/tmx2snes.exe
+tools/816-opt/816-opt
+tools/816-opt/816-opt.exe
 
-# tmx2snes files: 
+# tmx2snes files:
 *.b16
 *.o16
 *.t16
@@ -66,3 +66,9 @@ linkfile
 soundbank.asm
 soundbank.h
 *.log
+
+# debug files
+*.dbg
+
+# Mac OS cache files
+.DS_Store

.gitmodules

@@ -1,8 +1,9 @@
 [submodule "compiler/wla-dx"]
 	path = compiler/wla-dx
 	url = https://github.com/vhelin/wla-dx
-    ignore = dirty
-[submodule "compiler/tcc-65816"]
-	path = compiler/tcc-65816
+	ignore = dirty
+
+[submodule "compiler/tcc"]
+	path = compiler/tcc
 	url = https://github.com/alekmaul/tcc.git
-    ignore = dirty
+	ignore = dirty