Add genwrapper hook, that can be used to add code into the C wrapper.

master
Joey Hess 2009-09-10 14:04:46 -04:00
parent 98ed7cb1d7
commit 3ebd4e0b45
4 changed files with 17 additions and 4 deletions

View File

@ -39,6 +39,7 @@ sub import {
hook(type => "renamepage", id => "skeleton", call => \&renamepage);
hook(type => "rename", id => "skeleton", call => \&rename);
hook(type => "savestate", id => "skeleton", call => \&savestate);
hook(type => "genwrapper", id => "skeleton", call => \&genwrapper);
}
sub getopt () {
@ -239,4 +240,8 @@ sub savestate () {
debug("skeleton plugin running in savestate");
}
sub genwrapper () {
debug("skeleton plugin running in genwrapper");
}
1

View File

@ -38,11 +38,12 @@ sub gen_wrapper () {
EOF
}
my $test_receive="";
if ($config{test_receive}) {
require IkiWiki::Receive;
$test_receive=IkiWiki::Receive::gen_wrapper();
}
my @wrapper_hooks;
run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
my $check_commit_hook="";
my $pre_exec="";
@ -120,7 +121,7 @@ int main (int argc, char **argv) {
char *s;
$check_commit_hook
$test_receive
@wrapper_hooks
$envsave
newenviron[i++]="HOME=$ENV{HOME}";
newenviron[i++]="WRAPPED_OPTIONS=$configstring";
@ -144,7 +145,6 @@ $pre_exec
exit(1);
}
EOF
close OUT;
my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
if (system($cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {

1
debian/changelog vendored
View File

@ -7,6 +7,7 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
* underlay: Also allow configuring additional directories to search
for template files in.
* Fix parsing web commits from ipv6 addresses.
* Add genwrapper hook, that can be used to add code into the C wrapper.
-- Joey Hess <joeyh@debian.org> Wed, 02 Sep 2009 15:01:27 -0400

View File

@ -496,6 +496,13 @@ describes the plugin as a whole. For example:
and undef if a rebuild could be needed in some circumstances, but is not
strictly required.
### genwrapper
hook(type => "genwrapper", id => "foo", call => \&genwrapper);
This hook is used to inject C code (which it returns) into the `main`
function of the ikiwiki wrapper when it is being generated.
## Plugin interface
To import the ikiwiki plugin interface: