fix inconsistencies in part02

[rust-101.git] / Makefile

diff --git a/Makefile b/Makefile
index 01d7298aa64dc8bec4d0b12eebb1a96215d5d1c3..c157dacd438510f9ca826f9cf0815e93f1b4b584 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 pycco-rs 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 $<


@@ -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.
 # 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
 
 workspace/src/%.rs: src/%.rs Makefile dup-unimpl.sed

-       @mkdir -p .tmp/docs
+       @mkdir -p .tmp/docs workspace/src/

        @echo "$< -> $@"
        @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.
        @# 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
 

+docs/workspace.zip: $(WORKSPACEFILES) workspace/Cargo.toml workspace/Cargo.lock
+       @rm -f $@
+       zip $@ $^
+

 ## Crates
 crates: $(WORKSPACEFILES)
        @cargo build
 ## Crates
 crates: $(WORKSPACEFILES)
        @cargo build

-       @cd solutions && cargo build

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

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