Skip to content

Commit

Permalink
meta: repo cleanups, scripts, kak file
Browse files Browse the repository at this point in the history
  • Loading branch information
inodentry committed Apr 20, 2024
1 parent f4b1522 commit 880ea31
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
/doc/book
Cargo.lock
*.blend1
/proprietary
*.exe
/mw_hostrpc
/cfg/cert
/bin/*/proprietary
/bin/*/lib
/lib/*/proprietary
/lib/mw_game_minewars
19 changes: 18 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,24 @@ mw_auth_proprietary = { path = "../minewars-proprietary/lib/mw_auth_proprietary"

[workspace]
resolver = "2"
members = ["lib/*", "bin/*", "mobile"]
members = [
"mobile",
"lib/mw_app",
"lib/mw_dataformat",
"lib/mw_host",
"lib/mw_proto_hostauth",
"lib/mw_auth",
"lib/mw_game_minesweeper",
"lib/mw_proto_auth",
"lib/mw_proto_hostrpc",
"lib/mw_common",
"lib/mw_proto_host",
"bin/mw_authsrv",
"bin/mw_certgen",
"bin/mw_datatool",
"bin/mw_hostrpc",
"bin/mw_hostsrv",
]

# dev: Enable max optimizations for dependencies, but not for our code
[profile.dev.package."*"]
Expand Down
7 changes: 7 additions & 0 deletions cross-hostsrv-proprietary.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh
cargo build -p mw_hostsrv -p mw_hostrpc \
--config ./.cargo/config-cross.toml \
--target x86_64-pc-windows-gnu \
--features proprietary &&
cp ./target-cross/x86_64-pc-windows-gnu/debug/mw_hostsrv.exe ./target-cross/x86_64-pc-windows-gnu/debug/mw_hostrpc.exe . &&
exec ./mw_hostsrv.exe "$@"
6 changes: 6 additions & 0 deletions project.kak
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
set global lsp_config %{
[language.rust.settings.rust-analyzer]
# cargo.target = "x86_64-pc-windows-gnu"
# checkOnSave.allTargets = false
cargo.features = [ "proprietary", "dev" ]
}
6 changes: 6 additions & 0 deletions run-hostsrv-proprietary.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

export RUST_LOG="mw_host=trace,mw_hostsrv=trace"
cargo b -p mw_hostrpc &&
cp ./target/debug/mw_hostrpc . &&
exec cargo r -p mw_hostsrv --features proprietary -- "$@"
3 changes: 3 additions & 0 deletions run-proprietary.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

exec cargo r --features dev,proprietary

0 comments on commit 880ea31

Please sign in to comment.