fix warnings when compiling with rust 1.7

[rust-101.git] / Makefile

diff --git a/Makefile b/Makefile
index cb4172e8da0857e2c49d44fbcca3b2350fa2d9f1..a213c0713bb357059e335636305be15406e002a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,41 @@
-all: docs
-.PHONY: docs
+FILES=$(wildcard src/*.rs)
+DOCFILES=$(addsuffix .html,$(addprefix docs/,$(notdir $(basename $(FILES)))))
+WORKSPACEFILES=$(addprefix workspace/,$(FILES))

 
 

-docs:
-       docco src/*.rs -l linear
+all: docs workspace crates
+.PHONY: docs workspace crates
+
+## Documentation
+docs: $(DOCFILES)
+
+.tmp/docs/%.rs: src/%.rs Makefile pycco-rs dup-unimpl.sed
+       @mkdir -p .tmp/docs
+       @echo "$< -> $@"
+       @# 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 $<
+
+## 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)
+
+workspace/src/%.rs: src/%.rs Makefile dup-unimpl.sed
+       @mkdir -p .tmp/docs
+       @echo "$< -> $@"
+       @# sed-fu: remove lines starting with "//@", and replace those ending in "/*@*/" 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: $(WORKSPACEFILES)
+       @cargo build
+       @cd workspace && cargo build
+       @cd solutions && cargo build && cargo test