diff --git a/code/modules/atmospherics/gasmixtures/auxgm.dm b/code/modules/atmospherics/gasmixtures/auxgm.dm index 0ada77f002ef..b14e2582edc6 100644 --- a/code/modules/atmospherics/gasmixtures/auxgm.dm +++ b/code/modules/atmospherics/gasmixtures/auxgm.dm @@ -99,6 +99,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(GAS_O2, GAS_N2, GAS_CO2, GA if(gas.fire_products) fire_products[g] = gas.fire_products enthalpies[g] = gas.enthalpy + _auxtools_register_gas(gas) /proc/finalize_gas_refs() diff --git a/dependencies.sh b/dependencies.sh index a161fca6aa8e..7bfd7b62ecd3 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -22,4 +22,4 @@ export PHP_VERSION=7.2 export SPACEMAN_DMM_VERSION=suite-1.7 # Auxmos git tag -export AUXMOS_VERSION=4873bca8630154ef7d1a17a06163e273d8d1e576 +export AUXMOS_VERSION=708a593a9eb924c46ca0f1bb39c544f2f0c9b41d diff --git a/tools/tgs4_scripts/PreCompile.sh b/tools/tgs4_scripts/PreCompile.sh index 8575068c3809..0a82220cca87 100644 --- a/tools/tgs4_scripts/PreCompile.sh +++ b/tools/tgs4_scripts/PreCompile.sh @@ -1,94 +1,94 @@ -#!/bin/bash - -# REPO MAINTAINERS: KEEP CHANGES TO THIS IN SYNC WITH /tools/LinuxOneShot/SetupProgram/PreCompile.sh -# No ~mso -set -e -set -x - -#load dep exports -#need to switch to game dir for Dockerfile weirdness -original_dir=$PWD -cd "$1" -. dependencies.sh -cd "$original_dir" - -#find out what we have (+e is important for this) -set +e -has_git="$(command -v git)" -has_cargo="$(command -v ~/.cargo/bin/cargo)" -has_sudo="$(command -v sudo)" -has_grep="$(command -v grep)" -set -e - -# install cargo if needful -if ! [ -x "$has_cargo" ]; then - echo "Installing rust..." - curl https://sh.rustup.rs -sSf | sh -s -- -y - . ~/.profile -fi - -# apt packages, libssl needed by rust-g but not included in TGS barebones install -if ! ( [ -x "$has_git" ] && [ -x "$has_grep" ] && [ -f "/usr/lib/i386-linux-gnu/libssl.so" ] ); then - echo "Installing apt dependencies..." - if ! [ -x "$has_sudo" ]; then - dpkg --add-architecture i386 - apt-get update - apt-get install -y git libssl-dev:i386 - rm -rf /var/lib/apt/lists/* - else - sudo dpkg --add-architecture i386 - sudo apt-get update - sudo apt-get install -y git libssl-dev:i386 - sudo rm -rf /var/lib/apt/lists/* - fi -fi -dpkg --add-architecture i386 -apt-get update -#apt-get upgrade -y -apt-get install -y lib32z1 pkg-config libssl-dev:i386 libssl-dev -#update rust-g -if [ ! -d "rust-g" ]; then - echo "Cloning rust-g..." - git clone https://github.com/tgstation/rust-g - cd rust-g - ~/.cargo/bin/rustup target add i686-unknown-linux-gnu -else - echo "Fetching rust-g..." - cd rust-g - git fetch - ~/.cargo/bin/rustup target add i686-unknown-linux-gnu -fi - -echo "Deploying rust-g..." -git checkout "$RUST_G_VERSION" -env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --target=i686-unknown-linux-gnu -mv target/i686-unknown-linux-gnu/release/librust_g.so "$1/librust_g.so" -cd .. - -# Auxtools dependencies -apt-get install -y build-essential g++-multilib libc6-i386 libstdc++6:i386 - -# Update auxmos -if [ ! -d "auxmos" ]; then - echo "Cloning auxmos..." - git clone https://github.com/yogstation13/auxmos - cd auxmos - ~/.cargo/bin/rustup target add i686-unknown-linux-gnu -else - echo "Fetching auxmos..." - cd auxmos - git fetch - ~/.cargo/bin/rustup target add i686-unknown-linux-gnu -fi - -echo "Deploying auxmos..." -git checkout "$AUXMOS_VERSION" -env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo rustc --release --target=i686-unknown-linux-gnu --features all_reaction_hooks,katmos -- -C target-cpu=native -mv -f target/i686-unknown-linux-gnu/release/libauxmos.so "$1/libauxmos.so" -cd .. - -# compile tgui -echo "Compiling tgui..." -cd "$1" -chmod +x tools/bootstrap/node # Workaround for https://github.com/tgstation/tgstation-server/issues/1167 -env TG_BOOTSTRAP_CACHE="$original_dir" TG_BOOTSTRAP_NODE_LINUX=1 TG_BUILD_TGS_MODE=1 tools/bootstrap/node tools/build/build.js +#!/bin/bash + +# REPO MAINTAINERS: KEEP CHANGES TO THIS IN SYNC WITH /tools/LinuxOneShot/SetupProgram/PreCompile.sh +# No ~mso +set -e +set -x + +#load dep exports +#need to switch to game dir for Dockerfile weirdness +original_dir=$PWD +cd "$1" +. dependencies.sh +cd "$original_dir" + +#find out what we have (+e is important for this) +set +e +has_git="$(command -v git)" +has_cargo="$(command -v ~/.cargo/bin/cargo)" +has_sudo="$(command -v sudo)" +has_grep="$(command -v grep)" +set -e + +# install cargo if needful +if ! [ -x "$has_cargo" ]; then + echo "Installing rust..." + curl https://sh.rustup.rs -sSf | sh -s -- -y + . ~/.profile +fi + +# apt packages, libssl needed by rust-g but not included in TGS barebones install +if ! ( [ -x "$has_git" ] && [ -x "$has_grep" ] && [ -f "/usr/lib/i386-linux-gnu/libssl.so" ] ); then + echo "Installing apt dependencies..." + if ! [ -x "$has_sudo" ]; then + dpkg --add-architecture i386 + apt-get update + apt-get install -y git libssl-dev:i386 + rm -rf /var/lib/apt/lists/* + else + sudo dpkg --add-architecture i386 + sudo apt-get update + sudo apt-get install -y git libssl-dev:i386 + sudo rm -rf /var/lib/apt/lists/* + fi +fi +dpkg --add-architecture i386 +apt-get update +#apt-get upgrade -y +apt-get install -y lib32z1 pkg-config libssl-dev:i386 libssl-dev +#update rust-g +if [ ! -d "rust-g" ]; then + echo "Cloning rust-g..." + git clone https://github.com/tgstation/rust-g + cd rust-g + ~/.cargo/bin/rustup target add i686-unknown-linux-gnu +else + echo "Fetching rust-g..." + cd rust-g + git fetch + ~/.cargo/bin/rustup target add i686-unknown-linux-gnu +fi + +echo "Deploying rust-g..." +git checkout "$RUST_G_VERSION" +env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --target=i686-unknown-linux-gnu +mv target/i686-unknown-linux-gnu/release/librust_g.so "$1/librust_g.so" +cd .. + +# Auxtools dependencies +apt-get install -y build-essential g++-multilib libc6-i386 libstdc++6:i386 + +# Update auxmos +if [ ! -d "auxmos" ]; then + echo "Cloning auxmos..." + git clone https://github.com/yogstation13/auxmos + cd auxmos + ~/.cargo/bin/rustup target add i686-unknown-linux-gnu +else + echo "Fetching auxmos..." + cd auxmos + git fetch + ~/.cargo/bin/rustup target add i686-unknown-linux-gnu +fi + +echo "Deploying auxmos..." +git checkout "$AUXMOS_VERSION" +env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo rustc --release --target=i686-unknown-linux-gnu --features all_reaction_hooks,katmos -- -C target-cpu=native +mv -f target/i686-unknown-linux-gnu/release/libauxmos.so "$1/libauxmos.so" +cd .. + +# compile tgui +echo "Compiling tgui..." +cd "$1" +chmod +x tools/bootstrap/node # Workaround for https://github.com/tgstation/tgstation-server/issues/1167 +env TG_BOOTSTRAP_CACHE="$original_dir" TG_BOOTSTRAP_NODE_LINUX=1 TG_BUILD_TGS_MODE=1 tools/bootstrap/node tools/build/build.js