Wed Jan 22 06:16:23 2014 UTC ()
Add comment explaining why piperestart.cl2part is allowed to fail.


(riastradh)
diff -r1.8 -r1.9 src/usr.bin/vndcompress/Makefile
cvs diff -r1.8 -r1.9 src/usr.bin/vndcompress/Makefile (expand / switch to unified diff)

--- src/usr.bin/vndcompress/Makefile 2014/01/22 06:15:39 1.8
+++ src/usr.bin/vndcompress/Makefile 2014/01/22 06:16:23 1.9
@@ -79,26 +79,29 @@ tentinyblock.in: @@ -79,26 +79,29 @@ tentinyblock.in:
79 79
80CHECKS+= check-pipe-restart 80CHECKS+= check-pipe-restart
81CLEANFILES+= piperestart.in piperestart.in.tmp 81CLEANFILES+= piperestart.in piperestart.in.tmp
82CLEANFILES+= piperestart.cl2 piperestart.cl2.tmp 82CLEANFILES+= piperestart.cl2 piperestart.cl2.tmp
83CLEANFILES+= piperestart.cl2restart piperestart.cl2restart.tmp 83CLEANFILES+= piperestart.cl2restart piperestart.cl2restart.tmp
84CLEANFILES+= piperestart.cl2part piperestart.cl2part.tmp 84CLEANFILES+= piperestart.cl2part piperestart.cl2part.tmp
85check-pipe-restart: .PHONY piperestart.cl2 piperestart.cl2restart 85check-pipe-restart: .PHONY piperestart.cl2 piperestart.cl2restart
86 cmp ${.ALLSRC} 86 cmp ${.ALLSRC}
87piperestart.cl2restart: piperestart.cl2part vndcompress 87piperestart.cl2restart: piperestart.cl2part vndcompress
88 cp piperestart.cl2part ${.TARGET}.tmp \ 88 cp piperestart.cl2part ${.TARGET}.tmp \
89 && head -c 700000 < /usr/share/dict/words \ 89 && head -c 700000 < /usr/share/dict/words \
90 | ./vndcompress -l 655360 -k 1 -rR /dev/stdin ${.TARGET}.tmp \ 90 | ./vndcompress -l 655360 -k 1 -rR /dev/stdin ${.TARGET}.tmp \
91 && mv -f ${.TARGET}.tmp ${.TARGET} 91 && mv -f ${.TARGET}.tmp ${.TARGET}
 92# The following rule uses ; and not && on purpose: vndcompress is
 93# supposed to fail (and it is even OK to interrupt!) so we can restart
 94# and fill in the rest.
92piperestart.cl2part: vndcompress 95piperestart.cl2part: vndcompress
93 head -c 600000 < /usr/share/dict/words \ 96 head -c 600000 < /usr/share/dict/words \
94 | ./vndcompress -l 655360 -k 1 /dev/stdin ${.TARGET}.tmp; \ 97 | ./vndcompress -l 655360 -k 1 /dev/stdin ${.TARGET}.tmp; \
95 mv -f ${.TARGET}.tmp ${.TARGET} 98 mv -f ${.TARGET}.tmp ${.TARGET}
96piperestart.in: 99piperestart.in:
97 head -c 655360 < /usr/share/dict/words > ${.TARGET}.tmp \ 100 head -c 655360 < /usr/share/dict/words > ${.TARGET}.tmp \
98 && mv -f ${.TARGET}.tmp ${.TARGET} 101 && mv -f ${.TARGET}.tmp ${.TARGET}
99 102
100CHECKS+= check-part 103CHECKS+= check-part
101CLEANFILES+= part.orig part.cl2part part.cl2 part.out 104CLEANFILES+= part.orig part.cl2part part.cl2 part.out
102check-part: .PHONY part.orig part.out 105check-part: .PHONY part.orig part.out
103 cmp part.orig part.out 106 cmp part.orig part.out
104part.cl2: part.orig part.cl2part vndcompress 107part.cl2: part.orig part.cl2part vndcompress