X-Git-Url: https://git.ralfj.de/rust-101.git/blobdiff_plain/cb170f41304c809a22de172621845e637e28b8d2..refs/heads/test:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 01d7298..c157dac 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,12 @@ all: docs workspace crates
 ## 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-fu: remove the "@" from "//@", and remove trailing "/*@*/".
-	@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 $<
@@ -21,20 +22,24 @@ docs/%.html: .tmp/docs/%.rs
 # 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)
+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-fu: remove lines starting with "//@", and replace those ending in "/*@*/" by "unimplemented!()".
+	@# 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 > $@
+	@sed '/^\s*\/\/@/d;s|\(\s*\)\S.*/\*@@\?\*/|\1unimplemented!()|' $< | sed -f dup-unimpl.sed > $@
 
 workspace/src/main.rs:
 	# Don't touch this file
 
+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