fix use ordering
The recent setup revamp exposed some latent bugs in use/package ordering that caused some symbols to not the exported into the correct scope.master
parent
598a8ce1f7
commit
4e1d7d8ff2
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
package IkiWiki;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
|
@ -7,8 +9,6 @@ use IkiWiki::UserInfo;
|
||||||
use open qw{:utf8 :std};
|
use open qw{:utf8 :std};
|
||||||
use Encode;
|
use Encode;
|
||||||
|
|
||||||
package IkiWiki;
|
|
||||||
|
|
||||||
sub printheader ($) { #{{{
|
sub printheader ($) { #{{{
|
||||||
my $session=shift;
|
my $session=shift;
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
# Stubs for no revision control.
|
# Stubs for no revision control.
|
||||||
|
|
||||||
|
package IkiWiki;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
|
|
||||||
package IkiWiki;
|
|
||||||
|
|
||||||
sub rcs_update () {
|
sub rcs_update () {
|
||||||
# Update working directory to current version.
|
# Update working directory to current version.
|
||||||
# (May be more complex for distributed RCS.)
|
# (May be more complex for distributed RCS.)
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
package IkiWiki;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
use Encode;
|
use Encode;
|
||||||
use open qw{:utf8 :std};
|
use open qw{:utf8 :std};
|
||||||
|
|
||||||
package IkiWiki;
|
|
||||||
|
|
||||||
sub bzr_log ($) { #{{{
|
sub bzr_log ($) { #{{{
|
||||||
my $out = shift;
|
my $out = shift;
|
||||||
my @infos = ();
|
my @infos = ();
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
package IkiWiki;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
use Encode;
|
use Encode;
|
||||||
use open qw{:utf8 :std};
|
use open qw{:utf8 :std};
|
||||||
|
|
||||||
package IkiWiki;
|
|
||||||
|
|
||||||
my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
|
my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
|
||||||
my $dummy_commit_msg = 'dummy commit'; # message to skip in recent changes
|
my $dummy_commit_msg = 'dummy commit'; # message to skip in recent changes
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
package IkiWiki;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
use Encode;
|
use Encode;
|
||||||
use open qw{:utf8 :std};
|
use open qw{:utf8 :std};
|
||||||
|
|
||||||
package IkiWiki;
|
|
||||||
|
|
||||||
sub mercurial_log($) {
|
sub mercurial_log($) {
|
||||||
my $out = shift;
|
my $out = shift;
|
||||||
my @infos;
|
my @infos;
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
package IkiWiki;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
|
@ -6,8 +9,6 @@ use Monotone;
|
||||||
use Date::Parse qw(str2time);
|
use Date::Parse qw(str2time);
|
||||||
use Date::Format qw(time2str);
|
use Date::Format qw(time2str);
|
||||||
|
|
||||||
package IkiWiki;
|
|
||||||
|
|
||||||
my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate sha1sums
|
my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate sha1sums
|
||||||
|
|
||||||
sub check_config() { #{{{
|
sub check_config() { #{{{
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
package IkiWiki::Rcs::svn;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
use POSIX qw(setlocale LC_CTYPE);
|
use POSIX qw(setlocale LC_CTYPE);
|
||||||
|
|
||||||
package IkiWiki::Rcs::svn;
|
|
||||||
|
|
||||||
sub import { #{{{
|
sub import { #{{{
|
||||||
if (exists $IkiWiki::config{svnpath}) {
|
if (exists $IkiWiki::config{svnpath}) {
|
||||||
# code depends on the path not having extraneous slashes
|
# code depends on the path not having extraneous slashes
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
package IkiWiki;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
|
|
||||||
package IkiWiki;
|
|
||||||
|
|
||||||
sub quiet_system (@) {
|
sub quiet_system (@) {
|
||||||
# See Debian bug #385939.
|
# See Debian bug #385939.
|
||||||
open (SAVEOUT, ">&STDOUT");
|
open (SAVEOUT, ">&STDOUT");
|
||||||
|
|
|
@ -8,9 +8,11 @@
|
||||||
# IkiWiki::Setup::$raw_setup, to pass it back to this module.
|
# IkiWiki::Setup::$raw_setup, to pass it back to this module.
|
||||||
|
|
||||||
package IkiWiki::Setup;
|
package IkiWiki::Setup;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
|
use IkiWiki::Wrapper;
|
||||||
use open qw{:utf8 :std};
|
use open qw{:utf8 :std};
|
||||||
|
|
||||||
our $raw_setup;
|
our $raw_setup;
|
||||||
|
|
|
@ -3,12 +3,10 @@
|
||||||
# Parameters to import should be all the standard ikiwiki config stuff,
|
# Parameters to import should be all the standard ikiwiki config stuff,
|
||||||
# plus an array of wrappers to set up.
|
# plus an array of wrappers to set up.
|
||||||
|
|
||||||
|
package IkiWiki::Setup::Standard;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use IkiWiki::Wrapper;
|
|
||||||
use IkiWiki::Render;
|
|
||||||
|
|
||||||
package IkiWiki::Setup::Standard;
|
|
||||||
|
|
||||||
sub import {
|
sub import {
|
||||||
$IkiWiki::Setup::raw_setup=$_[1];
|
$IkiWiki::Setup::raw_setup=$_[1];
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
package IkiWiki;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use Storable;
|
use Storable;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
|
|
||||||
package IkiWiki;
|
|
||||||
|
|
||||||
sub userinfo_retrieve () { #{{{
|
sub userinfo_retrieve () { #{{{
|
||||||
my $userinfo=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
|
my $userinfo=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
|
||||||
return $userinfo;
|
return $userinfo;
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
package IkiWiki;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use Cwd q{abs_path};
|
use Cwd q{abs_path};
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
|
|
||||||
package IkiWiki;
|
|
||||||
|
|
||||||
sub gen_wrapper () { #{{{
|
sub gen_wrapper () { #{{{
|
||||||
$config{srcdir}=abs_path($config{srcdir});
|
$config{srcdir}=abs_path($config{srcdir});
|
||||||
$config{destdir}=abs_path($config{destdir});
|
$config{destdir}=abs_path($config{destdir});
|
||||||
|
|
Loading…
Reference in New Issue