From e329b9282cef5bbe5f4cb002857d01dcaf201066 Mon Sep 17 00:00:00 2001 From: IQuant Date: Sat, 20 Jul 2024 12:11:07 +0300 Subject: [PATCH] Organize build system a bit. --- Justfile | 36 ++++++++----------- scripts/.gitignore | 1 + scripts/extract_steam_redist.py | 4 +++ .../prepare_release.py | 7 ++-- 4 files changed, 25 insertions(+), 23 deletions(-) create mode 100644 scripts/.gitignore create mode 100644 scripts/extract_steam_redist.py rename prepare_release.py => scripts/prepare_release.py (98%) diff --git a/Justfile b/Justfile index 0412e173..0525ab98 100644 --- a/Justfile +++ b/Justfile @@ -1,33 +1,27 @@ -run: - cd noita-proxy && NP_APPID=480 NP_SKIP_MOD_CHECK=1 cargo run +extract_steam_redist: + python scripts/extract_steam_redist.py + +add_dylib_debug: extract_steam_redist + cp target/tmp/libsteam_api.so noita-proxy/target/debug/ + +add_dylib_release: extract_steam_redist + cp target/tmp/libsteam_api.so noita-proxy/target/release/ build: cd noita-proxy && cargo build cd noita-proxy && cargo build --release - cp target/tmp/libsteam_api.so noita-proxy/target/debug/ - cp target/tmp/libsteam_api.so noita-proxy/target/release/ -run-rel: +run-rel: add_dylib_release cd noita-proxy && NP_APPID=480 NP_SKIP_MOD_CHECK=1 cargo run --release -run-rel-n: - cd noita-proxy && NP_SKIP_MOD_CHECK=1 cargo run --release +run: add_dylib_debug + cd noita-proxy && NP_APPID=480 NP_SKIP_MOD_CHECK=1 cargo run -run-rel-n-2: - cd noita-proxy && NP_NOITA_ADDR=127.0.0.1:21252 NP_SKIP_MOD_CHECK=1 cargo run --release - -run2: +run2: add_dylib_debug cd noita-proxy && NP_APPID=480 NP_SKIP_MOD_CHECK=1 NP_NOITA_ADDR=127.0.0.1:21252 cargo run -- --launch-cmd "wine noita.exe -gamemode 0" -run3: +run3: add_dylib_debug cd noita-proxy && NP_APPID=480 NP_SKIP_MOD_CHECK=1 NP_NOITA_ADDR=127.0.0.1:21253 cargo run -- --launch-cmd "wine noita.exe -gamemode 0" -release: build - python prepare_release.py - -noita: - cd /home/quant/.local/share/Steam/steamapps/common/Noita/ && NP_NOITA_ADDR=127.0.0.1:21252 wine noita.exe -gamemode 0 - -noita1: - cd /home/quant/.local/share/Steam/steamapps/common/Noita/ && wine noita.exe - \ No newline at end of file +release: build add_dylib_release + python scripts/prepare_release.py diff --git a/scripts/.gitignore b/scripts/.gitignore new file mode 100644 index 00000000..ed8ebf58 --- /dev/null +++ b/scripts/.gitignore @@ -0,0 +1 @@ +__pycache__ \ No newline at end of file diff --git a/scripts/extract_steam_redist.py b/scripts/extract_steam_redist.py new file mode 100644 index 00000000..2b69c96d --- /dev/null +++ b/scripts/extract_steam_redist.py @@ -0,0 +1,4 @@ +import prepare_release + +if __name__ == "__main__": + prepare_release.extract_steam_redist() \ No newline at end of file diff --git a/prepare_release.py b/scripts/prepare_release.py similarity index 98% rename from prepare_release.py rename to scripts/prepare_release.py index ea4b5909..29cc7791 100644 --- a/prepare_release.py +++ b/scripts/prepare_release.py @@ -60,6 +60,10 @@ def get_pull_requests_from(date): parsed = call_parse_json(["gh", "pr", "list", "--state", "merged", "--search", "merged:>"+date, "--json", "number,title,author"]) return [PullRequest(entry["number"], entry["author"]["login"], entry["title"]) for entry in parsed] +def extract_steam_redist(): + with ZipFile("redist/steam_dylib.zip", "r") as steam_dylib_zip: + steam_dylib_zip.extractall("target/tmp") + def make_release_assets(): print("Compiling Noita Proxy...") @@ -79,8 +83,7 @@ def make_release_assets(): print("Extracting steam dylib...") - with ZipFile("redist/steam_dylib.zip", "r") as steam_dylib_zip: - steam_dylib_zip.extractall("target/tmp") + extract_steam_redist() print("Writing win release...")