Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

move tools and chat-cli in src/bin and examples

Browse Source
This commit is contained in:
Marcel Märtens 2020-12-12 02:12:00 +01:00
parent e54b4d5797
commit eba3532386
8 changed files with 21 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Cargo.lock generated
View File

@ -4929,15 +4929,6 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "tools"
version = "0.1.0"
dependencies = [
"csv",
"structopt",
"veloren-common",
]
[[package]] [[package]]
name = "tracing" name = "tracing"
version = "0.1.21" version = "0.1.21"
@ -5296,16 +5287,6 @@ dependencies = [
"static_assertions", "static_assertions",
] ]
[[package]]
name = "veloren-chat-cli"
version = "0.8.0"
dependencies = [
"tracing",
"tracing-subscriber",
"veloren-client",
"veloren-common",
]
[[package]] [[package]]
name = "veloren-client" name = "veloren-client"
version = "0.8.0" version = "0.8.0"
@ -5322,6 +5303,7 @@ dependencies = [
"rayon", "rayon",
"specs", "specs",
"tracing", "tracing",
"tracing-subscriber",
"uvth 3.1.1", "uvth 3.1.1",
"vek 0.12.0", "vek 0.12.0",
"veloren-common", "veloren-common",
@ -5337,6 +5319,7 @@ dependencies = [
"authc", "authc",
"criterion", "criterion",
"crossbeam", "crossbeam",
"csv",
"directories-next", "directories-next",
"dot_vox", "dot_vox",
"enum-iterator", "enum-iterator",
@ -5361,6 +5344,7 @@ dependencies = [
"specs", "specs",
"specs-idvs", "specs-idvs",
"spin_sleep", "spin_sleep",
"structopt",
"sum_type", "sum_type",
"tracing", "tracing",
"tracy-client", "tracy-client",

4
Cargo.toml
View File

@ -5,14 +5,12 @@ members = [
"common", "common",
"common/sys", "common/sys",
"client", "client",
"chat-cli",
"server", "server",
"server-cli", "server-cli",
"voxygen", "voxygen",
"voxygen/anim", "voxygen/anim",
"world", "world",
"network", "network",
"tools"
] ]
# default profile for devs, fast to compile, okay enough to run, no debug information # default profile for devs, fast to compile, okay enough to run, no debug information
@ -34,8 +32,6 @@ opt-level = 2
opt-level = 2 opt-level = 2
[profile.dev.package."veloren-client"] [profile.dev.package."veloren-client"]
opt-level = 2 opt-level = 2
[profile.dev.package."veloren-chat-cli"]
opt-level = 2
[profile.dev.package."veloren-server"] [profile.dev.package."veloren-server"]
opt-level = 2 opt-level = 2
[profile.dev.package."veloren-server-cli"] [profile.dev.package."veloren-server-cli"]

12
chat-cli/Cargo.toml
View File

@ -1,12 +0,0 @@
[package]
name = "veloren-chat-cli"
version = "0.8.0"
authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>"]
edition = "2018"
[dependencies]
client = { package = "veloren-client", path = "../client" }
common = { package = "veloren-common", path = "../common" }
tracing = { version = "0.1", default-features = false }
tracing-subscriber = { version = "0.2.3", default-features = false, features = ["fmt", "chrono", "ansi", "smallvec"] }

6
client/Cargo.toml
View File

@ -28,3 +28,9 @@ specs = { git = "https://github.com/amethyst/specs.git", rev = "7a2e348ab2223818
vek = { version = "0.12.0", features = ["serde"] } vek = { version = "0.12.0", features = ["serde"] }
hashbrown = { version = "0.7.2", features = ["rayon", "serde", "nightly"] } hashbrown = { version = "0.7.2", features = ["rayon", "serde", "nightly"] }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "b943c85e4a38f5ec60cd18c34c73097640162bfe" } authc = { git = "https://gitlab.com/veloren/auth.git", rev = "b943c85e4a38f5ec60cd18c34c73097640162bfe" }
[dev-dependencies]
tracing-subscriber = { version = "0.2.3", default-features = false, features = ["fmt", "chrono", "ansi", "smallvec"] }
[[example]]
name = "chat-cli"

2
chat-cli/src/main.rs → client/examples/chat-cli/main.rs
View File

@ -2,10 +2,10 @@
#![allow(clippy::option_map_unit_fn)] #![allow(clippy::option_map_unit_fn)]
#![deny(clippy::clone_on_ref_ptr)] #![deny(clippy::clone_on_ref_ptr)]
use client::{Client, Event};
use common::{clock::Clock, comp}; use common::{clock::Clock, comp};
use std::{io, net::ToSocketAddrs, sync::mpsc, thread, time::Duration}; use std::{io, net::ToSocketAddrs, sync::mpsc, thread, time::Duration};
use tracing::{error, info}; use tracing::{error, info};
use veloren_client::{Client, Event};
const TPS: u64 = 10; // Low value is okay, just reading messages. const TPS: u64 = 10; // Low value is okay, just reading messages.

10
common/Cargo.toml
View File

@ -8,6 +8,7 @@ edition = "2018"
no-assets = [] no-assets = []
tracy = ["tracy-client"] tracy = ["tracy-client"]
simd = ["vek/platform_intrinsics"] simd = ["vek/platform_intrinsics"]
bin_csv_export = ["csv", "structopt"]
default = ["simd"] default = ["simd"]
@ -53,10 +54,15 @@ serde = { version = "1.0.110", features = ["derive", "rc"] }
serde_json = "1.0.50" serde_json = "1.0.50"
serde_repr = "0.1.6" serde_repr = "0.1.6"
#esv export
csv = { version = "1.1.3", optional = true }
structopt = { version = "0.3.13", optional = true }
# Tracy # Tracy
tracy-client = { version = "0.9.0", optional = true } tracy-client = { version = "0.9.0", optional = true }
[dev-dependencies] [dev-dependencies]
#bench
criterion = "0.3" criterion = "0.3"
[[bench]] [[bench]]
@ -66,3 +72,7 @@ harness = false
[[bench]] [[bench]]
name = "color_benchmark" name = "color_benchmark"
harness = false harness = false
[[bin]]
name = "csv_export"
required-features = ["bin_csv_export"]

2
tools/src/main.rs → common/src/bin/csv_export/main.rs
View File

@ -3,12 +3,12 @@
use std::error::Error; use std::error::Error;
use structopt::StructOpt; use structopt::StructOpt;
use common::comp;
use comp::item::{ use comp::item::{
armor::{ArmorKind, Protection}, armor::{ArmorKind, Protection},
tool::ToolKind, tool::ToolKind,
ItemKind, ItemKind,
}; };
use veloren_common::comp;
#[derive(StructOpt)] #[derive(StructOpt)]
struct Cli { struct Cli {

10
tools/Cargo.toml
View File

@ -1,10 +0,0 @@
[package]
name = "tools"
version = "0.1.0"
authors = ["Sam <samuelkeiffer@gmail.com>"]
edition = "2018"
[dependencies]
common = { package = "veloren-common", path = "../common" }
csv = "1.1.3"
structopt = "0.3.13"