Skip to content

Commit 02a09a7

Browse files
Upgrades TGS build script to actually build RUSTG (ParadiseSS13#25340)
1 parent 2144a93 commit 02a09a7

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

.tgs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version: 1
44
# The BYOND version to use
55
# Must be interpreted as a string, keep quoted
6-
byond: "515.1620"
6+
byond: '515.1633'
77
# Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
88
static_files:
99
# Config directory should be static

tools/tgs_scripts/PreCompile.sh

+16-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,22 @@ cd "$1"
1212
. dependencies.sh
1313
cd "$original_dir"
1414

15+
git config --global user.name
16+
if [ $? -eq 1 ]
17+
then
18+
git config --global user.name "paradise_tgs_script"
19+
fi
20+
21+
git config --global user.email
22+
if [ $? -eq 1 ]
23+
then
24+
git config --global user.email "[email protected]"
25+
fi
1526

1627
# update rust-g
1728
if [ ! -d "rust-g" ]; then
1829
echo "Cloning rust-g..."
19-
git clone https://github.com/tgstation/rust-g
30+
git clone https://github.com/ParadiseSS13/rust-g
2031
cd rust-g
2132
~/.cargo/bin/rustup target add i686-unknown-linux-gnu
2233
else
@@ -27,7 +38,9 @@ else
2738
fi
2839

2940
echo "Deploying rust-g..."
30-
git checkout "$RUST_G_VERSION"
41+
git reset --hard "$RUSTG_VERSION"
42+
./apply-patches.sh
43+
cd paradise-rust-g
3144
env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --features all --target=i686-unknown-linux-gnu
3245
mv target/i686-unknown-linux-gnu/release/librust_g.so "$1/librust_g.so"
33-
cd ..
46+
cd ../../

0 commit comments

Comments
 (0)