Skip to content

Commit

Permalink
Merge pull request #45 from BVE-Reborn/versioning
Browse files Browse the repository at this point in the history 
Start Versioning BVE
  • Loading branch information
@cwfitzgerald
cwfitzgerald authored Mar 9, 2020
2 parents 4a97513 + d1b7968 commit ef49419
Show file tree
Hide file tree
Showing 12 changed files with 35 additions and 31 deletions.
18 changes: 9 additions & 9 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bve-build/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bve-build"
version = "0.0.0-Placeholder"
version = "0.1.0"
description = "Remaking OpenBVE using a modern architecture, using Unity and Rust."
license = "MPL-2.0"
authors = ["Connor Fitzgerald <[email protected]>"]
Expand Down
9 changes: 5 additions & 4 deletions bve-client/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[package]
name = "bve-client"
version = "0.0.0-Placeholder"
version = "0.0.1"
description = "BVE-Reborn's main game client"
license = "MPL-2.0"
authors = ["Connor Fitzgerald <[email protected]>"]
edition = "2018"
publish = false

repository = "https://gitlab.bvereborn.com/bve-reborn/bve-reborn"
readme = "README.md"
Expand All @@ -14,6 +15,6 @@ keywords = ["bve", "rex", "engine"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bve = { version = "0.0.0-Placeholder", path = "../bve" }
bve-rex = { version = "0.0.0-Placeholder", path = "../bve-rex" }
bve-rex-sys = { version = "0.0.0-Placeholder", path = "../bve-rex-sys" }
bve = { version = "0.0.1", path = "../bve" }
bve-rex = { version = "0.0.1", path = "../bve-rex" }
bve-rex-sys = { version = "0.0.1", path = "../bve-rex-sys" }
5 changes: 3 additions & 2 deletions bve-corpus/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[package]
name = "bve-corpus"
version = "0.0.0-Placeholder"
version = "0.1.0"
description = "Program to run bve parsers against the entire corpus"
license = "MPL-2.0"
authors = ["Connor Fitzgerald <[email protected]>"]
edition = "2018"
publish = false

repository = "https://gitlab.bvereborn.com/bve-reborn/bve-reborn"
readme = "README.md"
Expand All @@ -16,7 +17,7 @@ keywords = ["bve", "serialization", "simulation"]
[dependencies]
anyhow = "1.0.26"
backtrace = "0.3.42"
bve = { version = "0.0.0-Placeholder", path = "../bve" }
bve = { version = "0.0.1", path = "../bve" }
clap = "2.33.0"
crossbeam = "0.7.3"
indicatif = "0.14.0"
Expand Down
2 changes: 1 addition & 1 deletion bve-derive/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bve-derive"
version = "0.0.0-Placeholder"
version = "0.0.1"
description = "Remaking OpenBVE using a modern architecture, using Unity and Rust."
license = "MPL-2.0"
authors = ["Connor Fitzgerald <[email protected]>"]
Expand Down
5 changes: 3 additions & 2 deletions bve-fuzz/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[package]
name = "bve-fuzz"
version = "0.0.0-Placeholder"
version = "0.0.1"
description = "Remaking OpenBVE using a modern architecture, using Unity and Rust."
license = "MPL-2.0"
authors = ["Connor Fitzgerald <[email protected]>"]
edition = "2018"
publish = false

repository = "https://gitlab.bvereborn.com/bve-reborn/bve-reborn"
readme = "README.md"
Expand All @@ -14,7 +15,7 @@ keywords = ["bve", "serialization", "simulation"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bve = { version = "0.0.0-Placeholder", path = "../bve" }
bve = { version = "0.0.1", path = "../bve" }

[target.'cfg(target_os = "linux")'.dependencies]
honggfuzz = "0.5.45"
6 changes: 3 additions & 3 deletions bve-native/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bve-native"
version = "0.0.0-Placeholder"
version = "0.0.1"
description = "Remaking OpenBVE using a modern architecture, using Unity and Rust. C API."
license = "MPL-2.0"
authors = ["Connor Fitzgerald <[email protected]>"]
Expand All @@ -18,6 +18,6 @@ crate-type = ["cdylib"]

[dependencies]
backtrace = "0.3.42"
bve = { version = "0.0.0-Placeholder", path = "../bve" }
bve-derive = { version = "0.0.0-Placeholder", path = "../bve-derive" }
bve = { version = "0.0.1", path = "../bve" }
bve-derive = { version = "0.0.1", path = "../bve-derive" }
libc = "0.2.66"
4 changes: 2 additions & 2 deletions bve-rex-sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bve-rex-sys"
version = "0.0.0-Placeholder"
version = "0.0.1"
description = "C bindings to BVE's fork of Rex"
license = "MPL-2.0"
authors = ["Connor Fitzgerald <[email protected]>"]
Expand All @@ -16,7 +16,7 @@ links = "bverex"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bve-derive = { version = "0.0.0-Placeholder", path = "../bve-derive" }
bve-derive = { version = "0.0.1", path = "../bve-derive" }
sdl2-sys = { version = "0.33.0", features = ["bundled"] }

[build-dependencies]
Expand Down
7 changes: 4 additions & 3 deletions bve-rex/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[package]
name = "bve-rex"
version = "0.0.0-Placeholder"
version = "0.0.1"
description = "Rusty Interface to BVE's fork of Rex"
license = "MPL-2.0"
authors = ["Connor Fitzgerald <[email protected]>"]
edition = "2018"
publish = false

repository = "https://gitlab.bvereborn.com/bve-reborn/bve-reborn"
readme = "README.md"
Expand All @@ -14,5 +15,5 @@ keywords = ["bve", "rex", "engine"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bve-derive = { version = "0.0.0-Placeholder", path = "../bve-derive" }
bve-rex-sys = { version = "0.0.0-Placeholder", path = "../bve-rex-sys" }
bve-derive = { version = "0.0.1", path = "../bve-derive" }
bve-rex-sys = { version = "0.0.1", path = "../bve-rex-sys" }
4 changes: 2 additions & 2 deletions bve/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bve"
version = "0.0.0-Placeholder"
version = "0.0.1"
description = "Remaking OpenBVE using a modern architecture, using Unity and Rust."
license = "MPL-2.0"
authors = ["Connor Fitzgerald <[email protected]>"]
Expand All @@ -15,7 +15,7 @@ keywords = ["bve", "serialization", "simulation"]

[dependencies]
bincode = "1.2.1"
bve-derive = { version = "0.0.0-Placeholder", path = "../bve-derive" }
bve-derive = { version = "0.0.1", path = "../bve-derive" }
cgmath = { version = "0.17", features = ["serde"] }
chardetng = "0.1.3"
crossbeam = "0.7.3"
Expand Down
2 changes: 1 addition & 1 deletion bve/src/l10n/current.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::l10n::{BVELanguage, BVELocale};
use locale_config::LanguageRange;

#[must_use]
pub fn get_current_language() -> BVELocale {
pub fn get_current_locale() -> BVELocale {
let locale = locale_config::Locale::user_default();

// Look for the message language
Expand Down
2 changes: 1 addition & 1 deletion bve/src/l10n/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mod current;
mod load;

pub static CURRENT_BVE_LOCALE: Lazy<RwLock<BVELocaleBundle>> =
Lazy::new(|| RwLock::new(load_locale_bundle(get_current_language())));
Lazy::new(|| RwLock::new(load_locale_bundle(get_current_locale())));
pub static ENGLISH_LOCALE: Lazy<BVELocaleBundle> =
Lazy::new(|| load_locale_bundle(BVELocale::from_language(BVELanguage::EN)));

Expand Down

0 comments on commit ef49419

Please sign in to comment.