Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 8a11b2ec6ba366dd49049add8b9ad320d78faaf9..07a66f3db279eabf6907c842e986b4c35095d3d5 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,7 +1,4 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-# Standard ikiwiki setup module.
-# Parameters to import should be all the standard ikiwiki config stuff,
-# plus an array of wrappers to set up.

 
 package IkiWiki::Setup::Standard;
 
 
 package IkiWiki::Setup::Standard;
 


@@ -9,11 +6,26 @@ use warnings;
 use strict;
 use IkiWiki;
 
 use strict;
 use IkiWiki;
 

-sub import { #{{{
+# Parameters to import should be all the standard ikiwiki config, in a hash.
+sub import {

        IkiWiki::Setup::merge($_[1]);
        IkiWiki::Setup::merge($_[1]);

-} #}}}
+}

 
 

-sub dumpline ($$$$) { #{{{
+sub gendump ($@) {
+       my $class=shift;
+
+       my $thisperl = eval q{use Config; $Config{perlpath}};
+       error($@) if $@;
+
+       "#!$thisperl",
+       "#",
+       (map { "# $_" } @_),
+       "use IkiWiki::Setup::Standard {",
+       IkiWiki::Setup::commented_dump(\&dumpline, "\t"),
+       "}"
+}
+
+sub dumpline ($$$$) {

        my $key=shift;
        my $value=shift;
        my $type=shift;
        my $key=shift;
        my $value=shift;
        my $type=shift;


@@ -21,11 +33,15 @@ sub dumpline ($$$$) { #{{{
        
        eval q{use Data::Dumper};
        error($@) if $@;
        
        eval q{use Data::Dumper};
        error($@) if $@;

+       no warnings 'once';

        local $Data::Dumper::Terse=1;
        local $Data::Dumper::Indent=1;
        local $Data::Dumper::Pad="\t";
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;
        local $Data::Dumper::Terse=1;
        local $Data::Dumper::Indent=1;
        local $Data::Dumper::Pad="\t";
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;

+       # only the perl version preserves utf-8 in output
+       local $Data::Dumper::Useperl=1;
+       use warnings;

        
        my $dumpedvalue;
        if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
        
        my $dumpedvalue;
        if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {


@@ -53,63 +69,6 @@ sub dumpline ($$$$) { #{{{
        }
        
        return "\t$prefix$key => $dumpedvalue,";
        }
        
        return "\t$prefix$key => $dumpedvalue,";

-} #}}}
-
-sub dumpvalues ($@) { #{{{
-       my $setup=shift;
-       my @ret;
-       while (@_) {
-               my $key=shift;
-               my %info=%{shift()};
-
-               next if $key eq "plugin" || $info{type} eq "internal";
-               
-               push @ret, "\t# ".$info{description} if exists $info{description};
-               
-               if (exists $setup->{$key} && defined $setup->{$key}) {
-                       push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
-                       delete $setup->{$key};
-               }
-               elsif (exists $info{example}) {
-                       push @ret, dumpline($key, $info{example}, $info{type}, "#");
-               }
-               else {
-                       push @ret, dumpline($key, "", $info{type}, "#");
-               }
-       }
-       return @ret;
-} #}}}
-
-sub gendump ($) { #{{{
-       my $description=shift;
-       my %setup=(%config);
-       my @ret;
-       
-       # disable logging to syslog while dumping
-       $config{syslog}=0;
-
-       push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
-       foreach my $pair (IkiWiki::Setup::getsetup()) {
-               my $plugin=$pair->[0];
-               my $setup=$pair->[1];
-               my @values=dumpvalues(\%setup, @{$setup});
-               if (@values) {
-                       push @ret, "", "\t# $plugin plugin", @values;
-               }
-       }
-
-       unshift @ret,
-               "#!/usr/bin/perl",
-               "# $description",
-               "#",
-               "# Passing this to ikiwiki --setup will make ikiwiki generate",
-               "# wrappers and build the wiki.",
-               "#",
-               "# Remember to re-run ikiwiki --setup any time you edit this file.",
-               "use IkiWiki::Setup::Standard {";
-       push @ret, "}";
-
-       return @ret;
-} #}}}
+}

 
 1
 
 1