v3.4.0-P

.github/workflows/rust.yml

@@ -30,22 +30,22 @@ jobs:
         with:
           toolchain: stable
           command: check
-          args: --manifest-path paradise-rust-g/Cargo.toml --target i686-pc-windows-msvc --all-features
+          args: --manifest-path paradise-rust-g/Cargo.toml --target i686-pc-windows-msvc --features all
       - name: Build (release) (default features)
         uses: actions-rs/cargo@v1
         with:
           toolchain: stable
           command: build
-          args: --manifest-path paradise-rust-g/Cargo.toml --target i686-pc-windows-msvc --release
-      - uses: actions/upload-artifact@v1
+          args: --manifest-path paradise-rust-g/Cargo.toml --target i686-pc-windows-msvc --release --features all
+      - uses: actions/upload-artifact@v4
         with:
           name: rust_g.dll
           path: paradise-rust-g/target/i686-pc-windows-msvc/release/rust_g.dll
   build-linux:
     runs-on: ubuntu-latest
     env:
-      BYOND_MAJOR: 513
-      BYOND_MINOR: 1536
+      BYOND_MAJOR: 515
+      BYOND_MINOR: 1642
       PKG_CONFIG_ALLOW_CROSS: 1
     steps:
       - uses: actions/checkout@v2
@@ -59,7 +59,7 @@ jobs:
       - run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt-get install g++-multilib zlib1g-dev:i386 libssl-dev:i386
+          sudo apt-get install g++-multilib zlib1g-dev:i386 libssl-dev:i386 libdbus-1-dev
           ./paradise-rust-g/scripts/install_byond.sh
       - uses: actions-rs/toolchain@v1
         with:
@@ -70,28 +70,28 @@ jobs:
         with:
           toolchain: stable
           command: check
-          args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --all-features
+          args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --features all
       - name: Build (Debug) (all features)
         uses: actions-rs/cargo@v1
         with:
           toolchain: stable
           command: build
-          args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --all-features
+          args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --features all
       - name: Run tests (all features)
         uses: actions-rs/cargo@v1
         with:
           toolchain: stable
           command: test
-          args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --all-features
+          args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --features all
         env:
           BYOND_BIN: /home/runner/BYOND/byond/bin
       - name: Build (release) (default features)
         uses: actions-rs/cargo@v1
         with:
           toolchain: stable
           command: build
-          args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --release
-      - uses: actions/upload-artifact@v1
+          args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --release --features all
+      - uses: actions/upload-artifact@v4
         with:
           name: rust_g
           path: paradise-rust-g/target/i686-unknown-linux-gnu/release/librust_g.so

README.MD

@@ -13,8 +13,8 @@ The license for RUST-G itself can be found on tg's repo. Code for the Paradise m
 1. You **must** have a copy of `Git Bash` or some other bash emulator on windows, and a git identity setup. This will not work otherwise.
 2. Run the `apply_patches.sh` file to autocreate a clone of `tg-rust-g`, and apply the patches to it.
 3. Paradise RUST-G requires all features to be enabled.
-    - To build on windows, run `cargo build --release --all-features --target=i686-pc-windows-msvc`. This will generate a 32-bit `.dll` file that is compatible with BYOND.
-    - To build on linux, run `cargo build --release --all-features --target=i686-unknown-linux-gnu`. This will generate a 32-bit `.so` file that is compatible with BYOND.
+    - To build on windows, run `cargo build --release --features all --target=i686-pc-windows-msvc`. This will generate a 32-bit `.dll` file that is compatible with BYOND.
+    - To build on linux, run `cargo build --release --features all --target=i686-unknown-linux-gnu`. This will generate a 32-bit `.so` file that is compatible with BYOND.
 
 If you are still stuck, check tg's README. for more detailed instructions.
 

apply_patches.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 basedir=`pwd`
-tg_tag="3.0.0"
+tg_tag="3.4.0"
 
 echo "Checking for TG rust-g repo.."
 if [ ! -d "./tg-rust-g" ] 
@@ -46,4 +46,4 @@ apply_patch() {
     fi
 }
 
-apply_patch tg-rust-g paradise-rust-g origin/master
+apply_patch tg-rust-g paradise-rust-g $tg_tag