Move Rojo server into root of the repository

2019-08-27 16:56:52 -07:00
parent ec9afba029
commit 6f7dbe99fe
48 changed files with 50 additions and 54 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,53 @@
+[package]
+name = "rojo"
+version = "0.5.0"
+authors = ["Lucien Greathouse <me@lpghatguy.com>"]
+description = "Enables professional-grade development tools for Roblox developers"
+license = "MIT"
+repository = "https://github.com/rojo-rbx/rojo"
+edition = "2018"
+
 [workspace]
 members = [
-	"server",
-	"rojo-test",
+    "rojo-test",
 ]

 [profile.dev]
-opt-level = 1
+opt-level = 1
+
+[lib]
+name = "librojo"
+path = "src/lib.rs"
+
+[[bin]]
+name = "rojo"
+path = "src/bin.rs"
+
+[dependencies]
+clap = "2.27"
+crossbeam-channel = "0.3.9"
+csv = "1.0"
+env_logger = "0.6"
+failure = "0.1.3"
+futures = "0.1"
+hyper = "0.12"
+jod-thread = "0.1.0"
+log = "0.4"
+maplit = "1.0.1"
+notify = "4.0"
+rbx_binary = "0.4.1"
+rbx_dom_weak = "1.9.0"
+rbx_reflection = "3.1.388"
+rbx_xml = "0.11.0"
+regex = "1.0"
+ritz = "0.1.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+uuid = { version = "0.7", features = ["v4", "serde"] }
+
+[dev-dependencies]
+lazy_static = "1.2"
+paste = "0.1"
+pretty_assertions = "0.6.1"
+tempfile = "3.0"
+walkdir = "2.1"
--- a/server/assets/index.css
+++ b/server/assets/index.css
--- a/server/assets/place.project.json
+++ b/server/assets/place.project.json
--- a/server/assets/test-folder.rbxm
+++ b/server/assets/test-folder.rbxm
--- a/rojo-test/Cargo.toml
+++ b/rojo-test/Cargo.toml
@@ -11,4 +11,4 @@ paste = "0.1.5"
 tempfile = "3.1.0"

 # We execute Rojo via std::process::Command, so depend on it so it's built!
-rojo = { path = "../server" }
+rojo = { path = ".." }
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,49 +0,0 @@
-[package]
-name = "rojo"
-version = "0.5.0"
-authors = ["Lucien Greathouse <me@lpghatguy.com>"]
-description = "Enables professional-grade development tools for Roblox developers"
-license = "MIT"
-repository = "https://github.com/rojo-rbx/rojo"
-edition = "2018"
-
-[features]
-default = []
-server-plugins = []
-
-[lib]
-name = "librojo"
-path = "src/lib.rs"
-
-[[bin]]
-name = "rojo"
-path = "src/bin.rs"
-
-[dependencies]
-clap = "2.27"
-crossbeam-channel = "0.3.9"
-csv = "1.0"
-env_logger = "0.6"
-failure = "0.1.3"
-futures = "0.1"
-hyper = "0.12"
-jod-thread = "0.1.0"
-log = "0.4"
-maplit = "1.0.1"
-notify = "4.0"
-rbx_binary = "0.4.1"
-rbx_dom_weak = "1.9.0"
-rbx_reflection = "3.1.388"
-rbx_xml = "0.11.0"
-regex = "1.0"
-ritz = "0.1.0"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-uuid = { version = "0.7", features = ["v4", "serde"] }
-
-[dev-dependencies]
-lazy_static = "1.2"
-paste = "0.1"
-pretty_assertions = "0.6.1"
-tempfile = "3.0"
-walkdir = "2.1"
--- a/server/src/bin.rs
+++ b/server/src/bin.rs
--- a/server/src/commands/build.rs
+++ b/server/src/commands/build.rs
--- a/server/src/commands/init.rs
+++ b/server/src/commands/init.rs
--- a/server/src/commands/mod.rs
+++ b/server/src/commands/mod.rs
--- a/server/src/commands/serve.rs
+++ b/server/src/commands/serve.rs
--- a/server/src/commands/upload.rs
+++ b/server/src/commands/upload.rs
--- a/server/src/imfs/error.rs
+++ b/server/src/imfs/error.rs
--- a/server/src/imfs/fetcher.rs
+++ b/server/src/imfs/fetcher.rs
--- a/server/src/imfs/imfs.rs
+++ b/server/src/imfs/imfs.rs
--- a/server/src/imfs/mod.rs
+++ b/server/src/imfs/mod.rs
--- a/server/src/imfs/noop_fetcher.rs
+++ b/server/src/imfs/noop_fetcher.rs
--- a/server/src/imfs/real_fetcher.rs
+++ b/server/src/imfs/real_fetcher.rs
--- a/server/src/imfs/snapshot.rs
+++ b/server/src/imfs/snapshot.rs
--- a/server/src/impl_from.rs
+++ b/server/src/impl_from.rs
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
--- a/server/src/message_queue.rs
+++ b/server/src/message_queue.rs
--- a/server/src/path_map.rs
+++ b/server/src/path_map.rs
--- a/server/src/path_serializer.rs
+++ b/server/src/path_serializer.rs
--- a/server/src/project.rs
+++ b/server/src/project.rs
--- a/server/src/serve_session.rs
+++ b/server/src/serve_session.rs
--- a/server/src/session_id.rs
+++ b/server/src/session_id.rs
--- a/server/src/snapshot/instance_snapshot.rs
+++ b/server/src/snapshot/instance_snapshot.rs
--- a/server/src/snapshot/mod.rs
+++ b/server/src/snapshot/mod.rs
--- a/server/src/snapshot/patch.rs
+++ b/server/src/snapshot/patch.rs
--- a/server/src/snapshot/patch_apply.rs
+++ b/server/src/snapshot/patch_apply.rs
--- a/server/src/snapshot/patch_compute.rs
+++ b/server/src/snapshot/patch_compute.rs
--- a/server/src/snapshot_middleware/context.rs
+++ b/server/src/snapshot_middleware/context.rs
--- a/server/src/snapshot_middleware/csv.rs
+++ b/server/src/snapshot_middleware/csv.rs
--- a/server/src/snapshot_middleware/dir.rs
+++ b/server/src/snapshot_middleware/dir.rs
--- a/server/src/snapshot_middleware/error.rs
+++ b/server/src/snapshot_middleware/error.rs
--- a/server/src/snapshot_middleware/json_model.rs
+++ b/server/src/snapshot_middleware/json_model.rs
--- a/server/src/snapshot_middleware/lua.rs
+++ b/server/src/snapshot_middleware/lua.rs
--- a/server/src/snapshot_middleware/middleware.rs
+++ b/server/src/snapshot_middleware/middleware.rs
--- a/server/src/snapshot_middleware/mod.rs
+++ b/server/src/snapshot_middleware/mod.rs
--- a/server/src/snapshot_middleware/project.rs
+++ b/server/src/snapshot_middleware/project.rs
--- a/server/src/snapshot_middleware/rbxm.rs
+++ b/server/src/snapshot_middleware/rbxm.rs
--- a/server/src/snapshot_middleware/rbxmx.rs
+++ b/server/src/snapshot_middleware/rbxmx.rs
--- a/server/src/snapshot_middleware/txt.rs
+++ b/server/src/snapshot_middleware/txt.rs
--- a/server/src/web/api.rs
+++ b/server/src/web/api.rs
--- a/server/src/web/interface.rs
+++ b/server/src/web/interface.rs
--- a/server/src/web/mod.rs
+++ b/server/src/web/mod.rs
--- a/server/tests/read_projects.rs
+++ b/server/tests/read_projects.rs
@@ -13,7 +13,7 @@ use librojo::project::{Project, ProjectNode};

 lazy_static! {
    static ref TEST_PROJECTS_ROOT: PathBuf =
-        { Path::new(env!("CARGO_MANIFEST_DIR")).join("../test-projects") };
+        { Path::new(env!("CARGO_MANIFEST_DIR")).join("test-projects") };
 }

 #[test]