Merge pull request #165 from dbalsom/version_0_4_0

Merge dev branch down to main.

Author: dbalsom

.cargo/config.toml

@@ -0,0 +1,8 @@
+[target.wasm32-unknown-unknown]
+# Wasm may be limited to 1GB of memory by default - this increases it to 4GB
+# See https://stackoverflow.com/questions/72334989/only-1-4th-of-max-memory-available-when-rust-wasm-compiled-with-atomics-flag-we
+rustflags = [
+    "-C", "target-feature=+atomics,+bulk-memory,+mutable-globals",
+    "-C", "link-arg=--max-memory=4294967296",
+    "--cfg", "getrandom_backend=\"wasm_js\""
+]

.clippy.toml

@@ -1,2 +1,3 @@
 # I'll make my functions as long as I want!!
 too-many-arguments-threshold = 8
+identity_op = false

.github/workflows/linux.yml

@@ -3,7 +3,9 @@ name: Linux
 on:
   push:
     branches:
-      - version_0_2_0
+      - main
+    paths-ignore:
+      - '**/*.md'
   pull_request:
 
 env:
@@ -15,6 +17,13 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
+      - name: Install nightly Rust
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init.sh
+          sh rustup-init.sh -y --default-host x86_64-unknown-linux-gnu --default-toolchain nightly --profile complete
+          . "$HOME/.cargo/env"
+          $HOME/.cargo/bin/cargo version
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -23,11 +32,26 @@ jobs:
       - name: Install dependencies
         run: >-
           sudo apt update && sudo apt install
+          pkg-config
           libasound2-dev
           libudev-dev
+          libc-dev
+          libx11-dev
+          libclang-dev
+
+      - name: Cache cargo registry, index, and build artifacts
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: rust-cache-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            rust-cache-${{ runner.os }}-
 
       - name: Cargo build
-        run: cargo build --profile release-lto --features ega
+        run: cargo build --profile release-lto --features use_winit,use_wgpu,sound,opl
 
       - name: Copy files into install dir
         run: cp LICENSE README.md CHANGELOG.md CREDITS.md target/release-lto/martypc install
@@ -47,5 +71,5 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: 'martypc-linux-gha${{ github.run_number }}'
+          name: martypc-linux-gha
           path: artifacts/martypc.tar

.github/workflows/macos.yml

@@ -3,7 +3,9 @@ name: macOS
 on:
   push:
     branches:
-      - version_0_2_0
+      - main
+    paths-ignore:
+      - '**/*.md'
   pull_request:
 
 env:
@@ -15,13 +17,20 @@ jobs:
     runs-on: macos-14
 
     steps:
+      - name: Install nightly Rust
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init.sh
+          sh rustup-init.sh -y --default-host aarch64-apple-darwin --default-toolchain nightly --profile complete
+          . "$HOME/.cargo/env"
+          $HOME/.cargo/bin/cargo version
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Cargo build
-        run: cargo build --profile release-lto --features ega
+        run: cargo +nightly build --profile release-lto --features use_winit,use_wgpu,sound,opl
 
       - name: Copy files into install dir
         run: cp LICENSE README.md CHANGELOG.md CREDITS.md target/release-lto/martypc install
@@ -49,13 +58,20 @@ jobs:
     runs-on: macos-13
 
     steps:
+      - name: Install nightly Rust
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init.sh
+          sh rustup-init.sh -y --default-host x86_64-apple-darwin --default-toolchain nightly --profile complete
+          . "$HOME/.cargo/env"
+          $HOME/.cargo/bin/cargo version
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Cargo build
-        run: cargo build --profile release-lto --features ega
+        run: cargo +nightly build --profile release-lto --features use_winit,use_wgpu,sound,opl
 
       - name: Copy files into install dir
         run: cp LICENSE README.md CHANGELOG.md CREDITS.md target/release-lto/martypc install

.github/workflows/windows.yml

@@ -3,7 +3,9 @@ name: Windows
 on:
   push:
     branches:
-      - version_0_2_0
+      - main
+    paths-ignore:
+      - '**/*.md'
   pull_request:
 
 env:
@@ -31,15 +33,22 @@ jobs:
           update: true
           msystem: ${{ matrix.environment.msystem }}
           pacboy: >-
-            rust:p
+            toolchain:p
+
+      - name: Install nightly Rust
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init.sh
+          sh rustup-init.sh -y --default-host x86_64-pc-windows-gnu --default-toolchain nightly --profile complete
+          $USERPROFILE/.cargo/bin/cargo version
 
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Cargo build
-        run: cargo build --profile release-lto --features ega
+        run: |
+          $USERPROFILE/.cargo/bin/cargo build --profile release-lto --features use_winit,use_wgpu,sound,opl
 
       - name: Copy files into install dir
         run: cp LICENSE README.md CHANGELOG.md CREDITS.md target/release-lto/martypc install
@@ -50,5 +59,5 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: 'martypc-windows-gha${{ github.run_number }}'
-          path: martypc
+          name: martypc-windows-gha
+          path: martypc

.gitignore

@@ -11,6 +11,11 @@ Thumbs.db
 #/.vscode
 /.vscode/settings.json
 
+# Jetbrains stuff
+/.idea/shelf/
+/.idea/dictionaries/Daniel.xml
+/.idea/workspace.xml
+
 # Emulator files
 /archive
 /program
@@ -23,6 +28,7 @@ marty*.toml
 *.cfg
 *.log
 *.exe
+*.dat
 /frontends/martypc_web_player_wgpu/wasm/
 icon.png
 *.crt
@@ -43,29 +49,53 @@ icon.png
 /install/media/roms/*
 /install/media/floppies/*
 /install/media/hdds/*
+/install/media/cartridges/*
+
+/install/mount/floppy/*
+!/install/mount/floppy/readme.md
+
 /install/output/screenshots/*
 /install/output/traces/*
 /install/output/dumps/*
+/install/output/tests/test_summary.csv
 
 # Dev machines not completed or functional
 /install/configs/machines/acid88.toml
-/install/configs/machines/ibmpcjr.toml
-/install/configs/machines/tandy1000.toml
-/install/configs/machines/compaq_portable.toml
+/install/configs/machines/s100.toml
+
 
 # Files to include for distribution
 !/install/media/roms/readme.md
+!/install/media/roms/XUB
 !/install/media/roms/GLaBIOS
+!/install/media/roms/*.toml
 !/install/martypc.toml
 
+# Files to include as wasm assets
+!/frontends/martypc_eframe/assets/martypc.toml
+
+/install/media/roms/romdef_s100.toml
+/install/media/roms/romdef_ast.toml
+/install/media/roms/GLaBIOS/parking
+
+# Ignore autofloppy dirs
+/install/media/mount/floppy/*
+!/install/media/mount/floppy/readme.md
+
+# Disk dumps
+/install/*.img
+
 # Frontend files
 /frontends/martypc_web_player_wgpu/web/bin
 
 # Assembly stuff
 /asm
-/.idea/shelf/
-/.idea/dictionaries/Daniel.xml
-/.idea/workspace.xml
+/install/program/*
+
+#misc
 /flopgen/flopgen_LICENSE.txt
 /tree.txt
 
+/test-gen/
+
+