typos, and a TODO list

[rust-101.git] / Makefile

diff --git a/Makefile b/Makefile
index 2e7758b777338d4d70527fd76de1e2aa21978944..f59d575f8ebac5151e9cff3e4f87c4c52709df82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,32 +5,36 @@ WORKSPACEFILES=$(addprefix workspace/,$(FILES))
 all: docs workspace crates
 .PHONY: docs workspace crates
 
 all: docs workspace crates
 .PHONY: docs workspace crates
 

-# Documentation
+## Documentation

 docs: $(DOCFILES)
 
 .tmp/docs/%.rs: src/%.rs Makefile
        @mkdir -p .tmp/docs
        @echo "$< -> $@"
 docs: $(DOCFILES)
 
 .tmp/docs/%.rs: src/%.rs Makefile
        @mkdir -p .tmp/docs
        @echo "$< -> $@"

-       @sed 's|^\(\s*//\)@|\1|;s|\s*/\*@\*/||' $< > $@
+       @# sed-fu: remove the "@" from "//@", and remove trailing "/*@*/".
+       @sed 's|^\(\s*//\)@|\1|;s|\s*/\*@\*/$$||' $< > $@

 
 docs/%.html: .tmp/docs/%.rs
        @./pycco-rs $<
 
 
 docs/%.html: .tmp/docs/%.rs
        @./pycco-rs $<
 

-# Workspace
+## 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 "$< -> $@"
 workspace: $(WORKSPACEFILES)
 
 workspace/src/%.rs: src/%.rs Makefile dup-unimpl.sed
        @mkdir -p .tmp/docs
        @echo "$< -> $@"

-       @echo "// ***Remember to enable/add this part in \`main.rs\`!***" > $@
-       @echo >> $@
-       @sed '/^\s*\/\/@/d;s|\(\s*\)\S.*/\*@\*/|\1unimplemented!()|' $< | sed -f dup-unimpl.sed >> $@
+       @# 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
 
 
 workspace/src/main.rs:
        # Don't touch this file
 

-# Crates
-crates:
+## Crates
+crates: $(WORKSPACEFILES)

        @cargo build
        @cargo build

-       @cd solutions && cargo build

        @cd workspace && cargo build
        @cd workspace && cargo build

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