Merge branch 'master' into dev

azure-pipelines/azure-pipelines.yml

@@ -0,0 +1,81 @@
+jobs:
+- job: RPI4_dmx_32bit
+  strategy:
+    matrix:
+      rpi4-dmx:
+        platform: 'rpi4'
+  pool: RPI-32
+  steps:
+    - template: rpi4.yml
+
+- job: RPI3_dmx_32bit
+  strategy:
+    matrix:
+      rpi3-dmx:
+        platform: 'rpi3'
+  pool: RPI-32
+  steps:
+    - template: rpi3.yml
+
+- job: RPI2_dmx_32bit
+  strategy:
+    matrix:
+      rpi2-dmx:
+        platform: 'rpi2'
+  pool: RPI-32
+  steps:
+    - template: rpi2.yml
+
+- job: RPI1_dmx_32bit
+  strategy:
+    matrix:
+      rpi1-dmx:
+        platform: 'rpi1'
+  pool: RPI-32
+  steps:
+    - template: rpi1.yml
+
+- job: RPI4_sdl2_32bit
+  strategy:
+    matrix:
+      rpi4-sdl2:
+        platform: 'rpi4-sdl2'
+  pool: RPI-32
+  steps:
+    - template: rpi4-sdl2.yml
+
+- job: RPI3_sdl2_32bit
+  strategy:
+    matrix:
+      rpi3-sdl2:
+        platform: 'rpi3-sdl2'
+  pool: RPI-32
+  steps:
+    - template: rpi3-sdl2.yml
+
+- job: RPI2_sdl2_32bit
+  strategy:
+    matrix:
+      rpi2-sdl2:
+        platform: 'rpi2-sdl2'
+  pool: RPI-32
+  steps:
+    - template: rpi2-sdl2.yml
+
+- job: RPI1_sdl2_32bit
+  strategy:
+    matrix:
+      rpi1-sdl2:
+        platform: 'rpi1-sdl2'
+  pool: RPI-32
+  steps:
+    - template: rpi1-sdl2.yml
+
+- job: RPI4_64bit
+  strategy:
+    matrix:
+      rpi4-sdl2-64bit:
+        platform: 'pi64'
+  pool: RPI-64
+  steps:
+    - template: pi64.yml

azure-pipelines/pi64.yml

@@ -0,0 +1,31 @@
+# RPI4, SDL2, 64-bit
+steps:
+  - checkout: self
+    submodules: true
+  - script: |
+      cd external/capsimg
+      ./bootstrap.fs
+      ./configure.fs
+      make -f Makefile.fs
+      cp capsimg.so $(Build.SourcesDirectory)
+      cd $(Build.SourcesDirectory)
+      make -j4 PLATFORM=pi64
+    displayName: 'Compile for RPI4 64-bit'
+  
+  - task: CopyFiles@2
+    inputs:
+     Contents: |
+        amiberry
+        capsimg.so
+        conf/**
+        data/**
+        kickstarts/**
+        savestates/**
+        screenshots/**
+        whdboot/**
+     TargetFolder: $(Build.ArtifactStagingDirectory)
+  
+  - task: PublishBuildArtifacts@1
+    inputs:
+     PathtoPublish: $(Build.ArtifactStagingDirectory)
+     ArtifactName: pi64_release

azure-pipelines/rpi1-sdl2.yml

@@ -0,0 +1,31 @@
+# RPI1, SDL2, 32-bit
+steps:
+  - checkout: self
+    submodules: true
+  - script: |
+      cd external/capsimg
+      ./bootstrap.fs
+      ./configure.fs
+      make -f Makefile.fs
+      cp capsimg.so $(Build.SourcesDirectory)
+      cd $(Build.SourcesDirectory)
+      make -j4 PLATFORM=rpi1-sdl2
+    displayName: 'Compile for RPI1 (SDL2) 32-bit'
+  
+  - task: CopyFiles@2
+    inputs:
+     Contents: |
+        amiberry
+        capsimg.so
+        conf/**
+        data/**
+        kickstarts/**
+        savestates/**
+        screenshots/**
+        whdboot/**
+     TargetFolder: $(Build.ArtifactStagingDirectory)
+  
+  - task: PublishBuildArtifacts@1
+    inputs:
+     PathtoPublish: $(Build.ArtifactStagingDirectory)
+     ArtifactName: rpi1_sdl2_release

azure-pipelines/rpi1.yml

@@ -0,0 +1,31 @@
+# RPI3, Dispmanx, 32-bit
+steps:
+  - checkout: self
+    submodules: true
+  - script: |
+      cd external/capsimg
+      ./bootstrap.fs
+      ./configure.fs
+      make -f Makefile.fs
+      cp capsimg.so $(Build.SourcesDirectory)
+      cd $(Build.SourcesDirectory)
+      make -j4 PLATFORM=rpi1
+    displayName: 'Compile for RPI1 (Dispmanx) 32-bit'
+  
+  - task: CopyFiles@2
+    inputs:
+     Contents: |
+        amiberry
+        capsimg.so
+        conf/**
+        data/**
+        kickstarts/**
+        savestates/**
+        screenshots/**
+        whdboot/**
+     TargetFolder: $(Build.ArtifactStagingDirectory)
+  
+  - task: PublishBuildArtifacts@1
+    inputs:
+     PathtoPublish: $(Build.ArtifactStagingDirectory)
+     ArtifactName: rpi1_dmx_release

azure-pipelines/rpi2-sdl2.yml

@@ -0,0 +1,31 @@
+# RPI2, SDL2, 32-bit
+steps:
+  - checkout: self
+    submodules: true
+  - script: |
+      cd external/capsimg
+      ./bootstrap.fs
+      ./configure.fs
+      make -f Makefile.fs
+      cp capsimg.so $(Build.SourcesDirectory)
+      cd $(Build.SourcesDirectory)
+      make -j4 PLATFORM=rpi2-sdl2
+    displayName: 'Compile for RPI2 (SDL2) 32-bit'
+  
+  - task: CopyFiles@2
+    inputs:
+     Contents: |
+        amiberry
+        capsimg.so
+        conf/**
+        data/**
+        kickstarts/**
+        savestates/**
+        screenshots/**
+        whdboot/**
+     TargetFolder: $(Build.ArtifactStagingDirectory)
+  
+  - task: PublishBuildArtifacts@1
+    inputs:
+     PathtoPublish: $(Build.ArtifactStagingDirectory)
+     ArtifactName: rpi2_sdl2_release

azure-pipelines/rpi2.yml

@@ -0,0 +1,31 @@
+# RPI3, Dispmanx, 32-bit
+steps:
+  - checkout: self
+    submodules: true
+  - script: |
+      cd external/capsimg
+      ./bootstrap.fs
+      ./configure.fs
+      make -f Makefile.fs
+      cp capsimg.so $(Build.SourcesDirectory)
+      cd $(Build.SourcesDirectory)
+      make -j4 PLATFORM=rpi2
+    displayName: 'Compile for RPI2 (Dispmanx) 32-bit'
+  
+  - task: CopyFiles@2
+    inputs:
+     Contents: |
+        amiberry
+        capsimg.so
+        conf/**
+        data/**
+        kickstarts/**
+        savestates/**
+        screenshots/**
+        whdboot/**
+     TargetFolder: $(Build.ArtifactStagingDirectory)
+  
+  - task: PublishBuildArtifacts@1
+    inputs:
+     PathtoPublish: $(Build.ArtifactStagingDirectory)
+     ArtifactName: rpi2_dmx_release

azure-pipelines/rpi3-sdl2.yml

@@ -0,0 +1,31 @@
+# RPI3, SDL2, 32-bit
+steps:
+  - checkout: self
+    submodules: true
+  - script: |
+      cd external/capsimg
+      ./bootstrap.fs
+      ./configure.fs
+      make -f Makefile.fs
+      cp capsimg.so $(Build.SourcesDirectory)
+      cd $(Build.SourcesDirectory)
+      make -j4 PLATFORM=rpi3-sdl2
+    displayName: 'Compile for RPI3 (SDL2) 32-bit'
+  
+  - task: CopyFiles@2
+    inputs:
+     Contents: |
+        amiberry
+        capsimg.so
+        conf/**
+        data/**
+        kickstarts/**
+        savestates/**
+        screenshots/**
+        whdboot/**
+     TargetFolder: $(Build.ArtifactStagingDirectory)
+  
+  - task: PublishBuildArtifacts@1
+    inputs:
+     PathtoPublish: $(Build.ArtifactStagingDirectory)
+     ArtifactName: rpi3_sdl2_release

azure-pipelines/rpi3.yml

@@ -0,0 +1,31 @@
+# RPI3, Dispmanx, 32-bit
+steps:
+  - checkout: self
+    submodules: true
+  - script: |
+      cd external/capsimg
+      ./bootstrap.fs
+      ./configure.fs
+      make -f Makefile.fs
+      cp capsimg.so $(Build.SourcesDirectory)
+      cd $(Build.SourcesDirectory)
+      make -j4 PLATFORM=rpi3
+    displayName: 'Compile for RPI3 (Dispmanx) 32-bit'
+  
+  - task: CopyFiles@2
+    inputs:
+     Contents: |
+        amiberry
+        capsimg.so
+        conf/**
+        data/**
+        kickstarts/**
+        savestates/**
+        screenshots/**
+        whdboot/**
+     TargetFolder: $(Build.ArtifactStagingDirectory)
+  
+  - task: PublishBuildArtifacts@1
+    inputs:
+     PathtoPublish: $(Build.ArtifactStagingDirectory)
+     ArtifactName: rpi3_dmx_release

azure-pipelines/rpi4-sdl2.yml

@@ -0,0 +1,31 @@
+# RPI4, SDL2, 32-bit
+steps:
+  - checkout: self
+    submodules: true
+  - script: |
+      cd external/capsimg
+      ./bootstrap.fs
+      ./configure.fs
+      make -f Makefile.fs
+      cp capsimg.so $(Build.SourcesDirectory)
+      cd $(Build.SourcesDirectory)
+      make -j4 PLATFORM=rpi4-sdl2
+    displayName: 'Compile for RPI4 (SDL2) 32-bit'
+  
+  - task: CopyFiles@2
+    inputs:
+     Contents: |
+        amiberry
+        capsimg.so
+        conf/**
+        data/**
+        kickstarts/**
+        savestates/**
+        screenshots/**
+        whdboot/**
+     TargetFolder: $(Build.ArtifactStagingDirectory)
+  
+  - task: PublishBuildArtifacts@1
+    inputs:
+     PathtoPublish: $(Build.ArtifactStagingDirectory)
+     ArtifactName: rpi4_sdl2_release

azure-pipelines/rpi4.yml

@@ -0,0 +1,31 @@
+# RPI4, Dispmanx, 32-bit
+steps:
+  - checkout: self
+    submodules: true
+  - script: |
+      cd external/capsimg
+      ./bootstrap.fs
+      ./configure.fs
+      make -f Makefile.fs
+      cp capsimg.so $(Build.SourcesDirectory)
+      cd $(Build.SourcesDirectory)
+      make -j4 PLATFORM=rpi4
+    displayName: 'Compile for RPI4 (Dispmanx) 32-bit'
+  
+  - task: CopyFiles@2
+    inputs:
+     Contents: |
+        amiberry
+        capsimg.so
+        conf/**
+        data/**
+        kickstarts/**
+        savestates/**
+        screenshots/**
+        whdboot/**
+     TargetFolder: $(Build.ArtifactStagingDirectory)
+  
+  - task: PublishBuildArtifacts@1
+    inputs:
+     PathtoPublish: $(Build.ArtifactStagingDirectory)
+     ArtifactName: rpi4_dmx_release