rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-22 21:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest rbx-tree

Browse Source
This commit is contained in:
Lucien Greathouse
2018-12-03 11:52:06 -08:00
parent f59a9040fc
commit db7f8ffb1b
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/Cargo.lock generated
View File

@@ -850,19 +850,9 @@ dependencies = [
] ]
[[package]] [[package]]
name = "rbx-tree" name = "rbx-binary"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/LPGhatguy/rbx-tree.git#9d42aa5da5132cc08bd04e30d235207e774d9909" source = "git+https://github.com/LPGhatguy/rbx-tree.git#c0393de710c32a1766b4ae829e24bab8a9e48cc2"
dependencies = [
"serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "rbxm"
version = "0.1.0"
source = "git+https://github.com/LPGhatguy/rbx-tree.git#9d42aa5da5132cc08bd04e30d235207e774d9909"
dependencies = [ dependencies = [
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"lz4 1.23.1 (registry+https://github.com/rust-lang/crates.io-index)", "lz4 1.23.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -870,9 +860,19 @@ dependencies = [
] ]
[[package]] [[package]]
name = "rbxmx" name = "rbx-tree"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/LPGhatguy/rbx-tree.git#9d42aa5da5132cc08bd04e30d235207e774d9909" source = "git+https://github.com/LPGhatguy/rbx-tree.git#c0393de710c32a1766b4ae829e24bab8a9e48cc2"
dependencies = [
"serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "rbx-xml"
version = "0.1.0"
source = "git+https://github.com/LPGhatguy/rbx-tree.git#c0393de710c32a1766b4ae829e24bab8a9e48cc2"
dependencies = [ dependencies = [
"rbx-tree 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)", "rbx-tree 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)",
"xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -930,9 +930,9 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"notify 4.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "notify 4.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"rbx-binary 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)",
"rbx-tree 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)", "rbx-tree 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)",
"rbxm 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)", "rbx-xml 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)",
"rbxmx 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)",
"regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rouille 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "rouille 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1509,9 +1509,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
"checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05" "checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05"
"checksum rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effa3fcaa47e18db002bdde6060944b6d2f9cfd8db471c30e873448ad9187be3" "checksum rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effa3fcaa47e18db002bdde6060944b6d2f9cfd8db471c30e873448ad9187be3"
"checksum rbx-binary 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)" = "<none>"
"checksum rbx-tree 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)" = "<none>" "checksum rbx-tree 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)" = "<none>"
"checksum rbxm 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)" = "<none>" "checksum rbx-xml 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)" = "<none>"
"checksum rbxmx 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)" = "<none>"
"checksum redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "679da7508e9a6390aeaf7fbd02a800fdc64b73fe2204dd2c8ae66d22d9d5ad5d" "checksum redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "679da7508e9a6390aeaf7fbd02a800fdc64b73fe2204dd2c8ae66d22d9d5ad5d"
"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
"checksum regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ee84f70c8c08744ea9641a731c7fadb475bf2ecc52d7f627feb833e0b3990467" "checksum regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ee84f70c8c08744ea9641a731c7fadb475bf2ecc52d7f627feb833e0b3990467"

4
server/Cargo.toml
View File

@@ -33,8 +33,8 @@ env_logger = "0.5"
uuid = { version = "0.7", features = ["v4", "serde"] } uuid = { version = "0.7", features = ["v4", "serde"] }
failure = "0.1.3" failure = "0.1.3"
rbx-tree = { git = "https://github.com/LPGhatguy/rbx-tree.git" } rbx-tree = { git = "https://github.com/LPGhatguy/rbx-tree.git" }
rbxmx = { git = "https://github.com/LPGhatguy/rbx-tree.git" } rbx-xml = { git = "https://github.com/LPGhatguy/rbx-tree.git" }
rbxm = { git = "https://github.com/LPGhatguy/rbx-tree.git" } rbx-binary = { git = "https://github.com/LPGhatguy/rbx-tree.git" }
[dev-dependencies] [dev-dependencies]
tempfile = "3.0" tempfile = "3.0"

8
server/src/commands/build.rs
View File

@@ -87,7 +87,7 @@ pub fn build(options: &BuildOptions) -> Result<(), BuildError> {
// descendants. // descendants.
let root_id = tree.get_root_id(); let root_id = tree.get_root_id();
rbxmx::encode(&tree, &[root_id], &mut file); rbx_xml::encode(&tree, &[root_id], &mut file);
}, },
OutputKind::Rbxlx => { OutputKind::Rbxlx => {
// Place files don't contain an entry for the DataModel, but our // Place files don't contain an entry for the DataModel, but our
@@ -95,16 +95,16 @@ pub fn build(options: &BuildOptions) -> Result<(), BuildError> {
let root_id = tree.get_root_id(); let root_id = tree.get_root_id();
let top_level_ids = tree.get_instance(root_id).unwrap().get_children_ids(); let top_level_ids = tree.get_instance(root_id).unwrap().get_children_ids();
rbxmx::encode(&tree, top_level_ids, &mut file); rbx_xml::encode(&tree, top_level_ids, &mut file);
}, },
OutputKind::Rbxm => { OutputKind::Rbxm => {
let root_id = tree.get_root_id(); let root_id = tree.get_root_id();
rbxm::encode(&tree, &[root_id], &mut file)?; rbx_binary::encode(&tree, &[root_id], &mut file)?;
}, },
OutputKind::Rbxl => { OutputKind::Rbxl => {
let root_id = tree.get_root_id(); let root_id = tree.get_root_id();
let top_level_ids = tree.get_instance(root_id).unwrap().get_children_ids(); let top_level_ids = tree.get_instance(root_id).unwrap().get_children_ids();
rbxm::encode(&tree, top_level_ids, &mut file)?; rbx_binary::encode(&tree, top_level_ids, &mut file)?;
}, },
} }