typos, and a TODO list

[rust-101.git] / Makefile

diff --git a/Makefile b/Makefile
index eb1851e73d17898b1c95503cde6d469e6dbb468e..f59d575f8ebac5151e9cff3e4f87c4c52709df82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,40 @@
 FILES=$(wildcard src/*.rs)
 DOCFILES=$(addsuffix .html,$(addprefix docs/,$(notdir $(basename $(FILES)))))
 FILES=$(wildcard src/*.rs)
 DOCFILES=$(addsuffix .html,$(addprefix docs/,$(notdir $(basename $(FILES)))))

+WORKSPACEFILES=$(addprefix workspace/,$(FILES))

 
 

-all: docs crates
-.PHONY: docs rawsrc crates
+all: docs workspace crates
+.PHONY: docs workspace crates

 
 

+## Documentation

 docs: $(DOCFILES)
 
 docs: $(DOCFILES)
 

-docs/%.html: src/%.rs
-       @./pycco-rs $^
+.tmp/docs/%.rs: src/%.rs Makefile
+       @mkdir -p .tmp/docs
+       @echo "$< -> $@"
+       @# sed-fu: remove the "@" from "//@", and remove trailing "/*@*/".
+       @sed 's|^\(\s*//\)@|\1|;s|\s*/\*@\*/$$||' $< > $@

 
 

-rawsrc:
-       @mkdir -p rawsrc
-       @for file in $(FILES); do echo "$$file -> rawsrc/$$file"; egrep -v "^[[:space:]]*// " "$$file" > "rawsrc/""$$file"; done
+docs/%.html: .tmp/docs/%.rs
+       @./pycco-rs $<

 
 

-crates:
+## 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
        @cargo build

-       @cd solutions && cargo build
+       @cd workspace && cargo build
+       @cd solutions && cargo build && cargo test