X-Git-Url: https://git.ralfj.de/rust-101.git/blobdiff_plain/35c4d2161ea07cfbb4085d7e5242ab9939889afa..HEAD:/Makefile

diff --git a/Makefile b/Makefile
index 0061b2b..d8c0e44 100644
--- a/Makefile
+++ b/Makefile
@@ -5,29 +5,41 @@ WORKSPACEFILES=$(addprefix workspace/,$(FILES))
 all: docs workspace crates
 .PHONY: docs workspace crates
 
-# Documentation
+## Documentation
 docs: $(DOCFILES)
 
-.tmp/docs/%.rs: src/%.rs Makefile
+.tmp/docs/%.rs: src/%.rs Makefile pycco-rs dup-unimpl.sed
 	@mkdir -p .tmp/docs
 	@echo "$< -> $@"
-	@sed 's|^\(\s*//\)@|\1|;s|\s*/\*@\*/||' $< > $@
+	@# sed-fu: remove the "@" from "//@", and remove trailing "/*@*/", replace lines ending in  "/*@@*/" by "unimplemented!()".
+	@# Also coalesce multiple adjacent such lines to one.
+	@sed 's|^\(\s*//\)@|\1|;s|\s*/\*@\*/$$||;s|\(\s*\)\S.*/\*@@\*/|\1unimplemented!()|' $< | sed -f dup-unimpl.sed > $@
 
 docs/%.html: .tmp/docs/%.rs
-	@./pycco-rs $<
+	~/.local/pipx/venvs/pycco/bin/python pycco-rs $<
 
-# Workspace
-workspace: $(WORKSPACEFILES)
+## Workspace
+# The generated files are shipped only for the benefit of Windows users, who
+# typically don't have the necessary tools for generating the workspace
+# available.
+workspace: $(WORKSPACEFILES) docs/workspace.zip
 
 workspace/src/%.rs: src/%.rs Makefile dup-unimpl.sed
-	@mkdir -p .tmp/docs
+	@mkdir -p .tmp/docs workspace/src/
 	@echo "$< -> $@"
-	@sed '/^\s*\/\/@/d;s|\(\s*\)[^\s].*/\*@\*/|\1unimplemented!()|' $< | sed -f dup-unimpl.sed > $@
+	@# sed-fu: remove lines starting with "//@", and replace those ending in "/*@*/" or "/*@@*/" by "unimplemented!()".
+	@# Also coalesce multiple adjacent such lines to one.
+	@sed '/^\s*\/\/@/d;s|\(\s*\)\S.*/\*@@\?\*/|\1unimplemented!()|' $< | sed -f dup-unimpl.sed > $@
 
 workspace/src/main.rs:
 	# Don't touch this file
 
-# Crates
-crates:
+docs/workspace.zip: $(WORKSPACEFILES) workspace/Cargo.toml workspace/Cargo.lock
+	@rm -f $@
+	zip $@ $^
+
+## Crates
+crates: $(WORKSPACEFILES)
 	@cargo build
-	@cd solutions && cargo build
+	@cd workspace && cargo build
+	@cd solutions && cargo build && cargo test