Revert "break out otter-daemon into own crate"

We reverted most of this, now do the rest too.

This reverts commit 1d4f8f10aaeb9f613688285cd8600646b19d2faf.

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 896a54684200d7aff3a2a42e313b360fd4bc4b7a..14fd16b0ef4284db415c90d2f9b79557380a2bb5 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1155,19 +1155,6 @@ dependencies = [
  "vecdeque-stableix",
 ]
 
-[[package]]
-name = "otter-daemon"
-version = "0.0.1"
-dependencies = [
- "fehler",
- "otter",
- "otter-zcoord",
- "rocket",
- "rocket_contrib",
- "rocket_cors",
- "serde",
-]
-
 [[package]]
 name = "otter-wasm"
 version = "0.0.1"

diff --git a/Cargo.toml b/Cargo.toml
index afbc9bef7f46f1bad117e5ac844b2216b38458eb..3420370b9dbb54e9445b97f1402e3e2bc3dc4c5b 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ version = "0.0.1"
 edition = "2018"
 
 [workspace]
-members = ["wasm", "daemon"]
+members = ["wasm"]
 
 [dependencies]
 

diff --git a/Makefile b/Makefile
index 49313a3801aea6b0b4ee69effe519b894d48fee0..537c2d27df87832233fcd39dc5f63fcdc45ea4d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -138,7 +138,7 @@ CARGOES=$(foreach t, wasm-,$(addprefix $t,check $(DR)))
 
 $(addprefix stamp/cargo.,$(DR)):: \
 stamp/cargo.%: $(call rsrcs,. ! -path './wasm/*')
-       $(CARGO) build $(call cr,$*) -p otter -p otter-daemon
+       $(CARGO) build $(call cr,$*)
        $(stamp)
 
 stamp/cargo.check: $(call rsrcs,.)
@@ -155,7 +155,7 @@ stamp/cargo.wasm-%: $(call rsrcs, zcoord wasm Cargo.*)
        $(stamp)
 
 stamp/cargo.deploy-build: $(call rsrcs,.)
-       $(CARGO) -T$(DEPLOY_ARCH) build $(call cr,$(DEPLOY_RELEASE)) -p otter -p otter-daemon
+       $(CARGO) -T$(DEPLOY_ARCH) build $(call cr,$(DEPLOY_RELEASE))
        $(stamp)
 
 #---------- wasm ----------

diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
deleted file mode 100644 (file)
index e231ff2..0000000
--- a/daemon/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020 Ian Jackson
-# SPDX-License-Identifier: AGPL-3.0-or-later
-# There is NO WARRANTY.
-
-[package]
-name = "otter-daemon"
-authors = ["Ian Jackson <ijackson@chiark.greenend.org.uk>"]
-license = "AGPL-3.0-or-later"
-
-version = "0.0.1"
-edition = "2018"
-
-[[bin]]
-name = "daemon-otter"
-path = "main.rs"
-
-[dependencies]
-otter = { path = ".." }
-otter-zcoord = { path = "../zcoord" }
-
-fehler = "1"
-serde = { version = "1", features = ["derive","rc"] }
-
-rocket = { version = "^0.4.6", features=["sse"] }
-rocket_cors = "0.5"
-
-[dependencies.rocket_contrib]
-version = "0.4"
-default-features = false
-features = ["tera_templates","helmet","json","serve"]

diff --git a/daemon/main.rs b/src/bin/daemon-otter.rs
similarity index 100%
rename from daemon/main.rs
rename to src/bin/daemon-otter.rs