X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/823ec815d4fc9625d6fa3553ad03e9f2ff737659..8b09b29735b1dbbfe0ef33ad347ecb9bbdf45b75:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ee94ce659..022bfe3bd 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -7,7 +7,7 @@ use strict;
 use Encode;
 use HTML::Entities;
 use URI::Escape q{uri_escape_utf8};
-use POSIX;
+use POSIX ();
 use Storable;
 use open qw{:utf8 :std};
 
@@ -338,7 +338,7 @@ sub getsetup () {
 		type => "string",
 		default => undef,
 		example => '^\.htaccess$',
-		description => "regexp of normally ignored source files to include",
+		description => "regexp of normally excluded files to include",
 		advanced => 1,
 		safe => 0, # regexp
 		rebuild => 1,
@@ -346,8 +346,8 @@ sub getsetup () {
 	exclude => {
 		type => "string",
 		default => undef,
-		example => '\.wav$',
-		description => "regexp of source files to ignore",
+		example => '^(*\.private|Makefile)$',
+		description => "regexp of files that should be skipped",
 		advanced => 1,
 		safe => 0, # regexp
 		rebuild => 1,
@@ -467,6 +467,13 @@ sub getsetup () {
 		safe => 0,
 		rebuild => 0,
 	},
+	setuptype => {
+		type => "internal",
+		default => "Standard",
+		description => "perl class to use to dump setup file",
+		safe => 0,
+		rebuild => 0,
+	},
 	allow_symlinks_before_srcdir => {
 		type => "boolean",
 		default => 0,
@@ -1819,6 +1826,7 @@ sub deptype (@) {
 	return $deptype;
 }
 
+my $file_prune_regexp;
 sub file_pruned ($;$) {
 	my $file=shift;
 	if (@_) {
@@ -1833,8 +1841,11 @@ sub file_pruned ($;$) {
 		return 0 if $file =~ m/$config{include}/;
 	}
 
-	my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
-	return $file =~ m/$regexp/;
+	if (! defined $file_prune_regexp) {
+		$file_prune_regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
+		$file_prune_regexp=qr/$file_prune_regexp/;
+	}
+	return $file =~ m/$file_prune_regexp/;
 }
 
 sub define_gettext () {