From e1a2aea8742082dda9838fa1079a2f2cd780dcf8 Mon Sep 17 00:00:00 2001 From: dakkar Date: Sun, 6 Sep 2015 15:45:20 +0100 Subject: now handle langs from different stages e.g. document.it.tt and document.en.rest.txt this seems to have broken some deps-checking --- lib/WebCoso.pm | 5 +++-- lib/WebCoso/Doc/Base.pm | 1 + lib/WebCoso/Maker.pm | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/WebCoso.pm b/lib/WebCoso.pm index 57818d5..a990b67 100644 --- a/lib/WebCoso.pm +++ b/lib/WebCoso.pm @@ -42,8 +42,9 @@ class WebCoso { method get-files($dir,$basename,$ext,:$make=True) { say "WebCoso($.srcdir,$.destdir,$!tmpdir)::get-files($dir,$basename,$ext,$make)"; - return self.get-src-files($dir,$basename,$ext) || - ( $make ?? self.get-made-files($dir,$basename,$ext) !! () ); + my %src = self.get-src-files($dir,$basename,$ext); + my %made = ( $make ?? self.get-made-files($dir,$basename,$ext) !! () ); + return flat %src,%made; } method put-file($dir,$basename,$lang,$ext,$contents) { diff --git a/lib/WebCoso/Doc/Base.pm b/lib/WebCoso/Doc/Base.pm index ab99164..6037ff9 100644 --- a/lib/WebCoso/Doc/Base.pm +++ b/lib/WebCoso/Doc/Base.pm @@ -30,6 +30,7 @@ class WebCoso::Doc::Base { when 'du.xml' { return $.rst.make() } when 'xhtml' { return $.xhtml.make() } when 'html' { return $.html.make() } + default: { return () } } } diff --git a/lib/WebCoso/Maker.pm b/lib/WebCoso/Maker.pm index d5436df..86241a7 100644 --- a/lib/WebCoso/Maker.pm +++ b/lib/WebCoso/Maker.pm @@ -33,6 +33,7 @@ role WebCoso::Maker[$from,$to] { my $dst = %dsts{$lang}; my @deps = %deps{$lang} // (); say "Maker[$from,$to]($.dir/$.basename)::make lang $lang"; + say "Maker[$from,$to]($.dir/$.basename)::make dst modified {$dst ?? $dst.modified !! 'not-there'} src modified {$src.modified}"; next if $dst and $dst.modified after all($src.modified,@deps».modified.flat); -- cgit v1.2.3