Skip to content

Commit

Permalink
works? maybe?
Browse files Browse the repository at this point in the history
  • Loading branch information
johndoe2013 committed Jun 17, 2024
1 parent c152b52 commit 99f2f5e
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/run_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
sudo apt update || true
sudo apt install -o APT::Immediate-Configure=false zlib1g-dev:i386 libssl-dev:i386
bash tools/ci/install_rust_g.sh
- name: Install auxlua
run: |
bash tools/ci/install_auxlua.sh
- name: Configure version
run: |
echo "BYOND_MAJOR=${{ inputs.major }}" >> $GITHUB_ENV
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,8 @@ colonialmarines.json

# From auxtools code coverage
code_coverage.xml

# Built auxtools libraries and intermediate files
#aux*.dll
#libaux*.so
#aux*.pdb
14 changes: 13 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": true
}
},
{
"name": "Debug External Libraries",
"type": "cppvsdbg",
"request": "launch",
"program": "${command:dreammaker.returnDreamDaemonPath}",
"cwd": "${workspaceRoot}",
"args": [
"${command:dreammaker.getFilenameDmb}",
"-trusted"
],
"preLaunchTask": "Build All"
},
]
}
Binary file added auxlua-coverage.dll
Binary file not shown.
1 change: 1 addition & 0 deletions code/__HELPERS/auxtools.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/// Macro for getting the auxtools library file
#define AUXLIB(name) (world.system_type == MS_WINDOWS ? "[#name].dll" : __detect_auxtools(#name))
#define AUXLUA AUXLIB(auxlua)

/proc/__detect_auxtools(library)
if(IsAdminAdvancedProcCall())
Expand Down
1 change: 1 addition & 0 deletions code/__HELPERS/auxtools_api.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ GLOBAL_PROTECT(auxtools_initialized)
CRASH("auxcov not loaded")

/world/Del()
AUXTOOLS_FULL_SHUTDOWN(AUXLUA)
var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
if (debug_server)
LIBCALL(debug_server, "auxtools_shutdown")()
Expand Down
2 changes: 1 addition & 1 deletion code/game/world.dm
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt"))

/world/proc/init_coverage()
#ifdef CODE_COVERAGE
AUXTOOLS_CHECK_NO_CONFIG(world.GetConfig("env", "AUXTOOLS_DEBUG_DLL"))
AUXTOOLS_CHECK_NO_CONFIG(AUXLUA)
start_code_coverage("code_coverage.xml")
#else
return
Expand Down
6 changes: 6 additions & 0 deletions dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,9 @@ export SPACEMAN_DMM_VERSION=suite-1.8

# Python version for mapmerge and other tools
export PYTHON_VERSION=3.7.9

#auxlua repo
export AUXLUA_REPO=tgstation/auxlua

#auxlua git tag
export AUXLUA_VERSION=1.4.4
9 changes: 9 additions & 0 deletions tools/ci/install_auxlua.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash
set -euo pipefail

source dependencies.sh

mkdir -p ~/.byond/bin
wget -nv -O ~/.byond/bin/libauxlua.so "https://github.com/$AUXLUA_REPO/releases/download/$AUXLUA_VERSION/libauxlua-coverage.so"
chmod +x ~/.byond/bin/libauxlua.so
ldd ~/.byond/bin/libauxlua.so

0 comments on commit 99f2f5e

Please sign in to comment.