diff options
| -rw-r--r-- | harness/include/plugin.h | 2 | ||||
| -rw-r--r-- | harness/tools/genintf.pl | 9 | ||||
| -rw-r--r-- | package.yaml | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/harness/include/plugin.h b/harness/include/plugin.h index feac626..d47abb2 100644 --- a/harness/include/plugin.h +++ b/harness/include/plugin.h @@ -19,7 +19,7 @@ #define EXPORT_INCLUDE(a) EXPORT_INCLUDE(<foreign_intf.h>) -EXPORT_INCLUDE(<wlr / types / wlr_keyboard.h>) +EXPORT_INCLUDE(<wlr/types/wlr_keyboard.h>) #define MAX_QUEUED_ACTIONS 8 diff --git a/harness/tools/genintf.pl b/harness/tools/genintf.pl index d446d83..12d525d 100644 --- a/harness/tools/genintf.pl +++ b/harness/tools/genintf.pl @@ -20,7 +20,9 @@ while (<STDIN>) { next; } - if (/^\s*EXPORT/) { + if (/^\s*EXPORT_INCLUDE\((.*)\)/) { + print "#include $1\n"; + } elsif (/^\s*EXPORT/) { my $line = "$_"; while (not ($line =~ /;$/)) { my $nextline = <STDIN>; @@ -28,10 +30,7 @@ while (<STDIN>) { $line="$line$nextline"; } - - if ($line =~ /^\s*EXPORT_INCLUDE\((.*)\)/s) { - print "#include $1\n"; - } elsif ($line =~ /^\s*EXPORT\(\s*((?:\w|\s*\*\s*)+)\s*\(\*(\w+)\)\s*\((.*)\)\);/s) { + if ($line =~ /^\s*EXPORT\(\s*((?:\w|\s*\*\s*)+)\s*\(\*(\w+)\)\s*\((.*)\)\);/s) { print "$comment"; print "$1 $2($3);\n\n"; $comment=""; diff --git a/package.yaml b/package.yaml index ba0b9d3..7a1bbc2 100644 --- a/package.yaml +++ b/package.yaml @@ -64,6 +64,8 @@ executables: - -shared - -Iharness/build/ - -Iharness/include/ + - -Iwlroots/include + - -DWLR_USE_UNSTABLE tests: wetterhorn-test: |