tweak parts 11-15 again

[rust-101.git] / Makefile

diff --git a/Makefile b/Makefile
index f59d575f8ebac5151e9cff3e4f87c4c52709df82..9264efcfd6c6ae30b61bea501ce2c3a059037060 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,12 @@ all: docs workspace crates
 ## Documentation
 docs: $(DOCFILES)
 
 ## Documentation
 docs: $(DOCFILES)
 

-.tmp/docs/%.rs: src/%.rs Makefile
+.tmp/docs/%.rs: src/%.rs Makefile dup-unimpl.sed

        @mkdir -p .tmp/docs
        @echo "$< -> $@"
        @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 $<
 
 docs/%.html: .tmp/docs/%.rs
        @./pycco-rs $<


@@ -28,7 +29,7 @@ workspace/src/%.rs: src/%.rs Makefile dup-unimpl.sed
        @echo "$< -> $@"
        @# sed-fu: remove lines starting with "//@", and replace those ending in "/*@*/" by "unimplemented!()".
        @# Also coalesce multiple adjacent such lines to one.
        @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 > $@
+       @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