aboutsummaryrefslogtreecommitdiff
path: root/harness
diff options
context:
space:
mode:
authorJosh Rahm <rahm@google.com>2024-02-21 12:28:34 -0700
committerJosh Rahm <rahm@google.com>2024-02-21 12:28:34 -0700
commitb68672eba4849628a58dfdddbb5ffa42e05db024 (patch)
tree7166a31a541144400672098c2aec92088918fd49 /harness
parentf070ba42d886025a6988afd1bd847057dca15b27 (diff)
downloadmontis-b68672eba4849628a58dfdddbb5ffa42e05db024.tar.gz
montis-b68672eba4849628a58dfdddbb5ffa42e05db024.tar.bz2
montis-b68672eba4849628a58dfdddbb5ffa42e05db024.zip
Fix plugin interface generation erros
Diffstat (limited to 'harness')
-rw-r--r--harness/include/plugin.h2
-rw-r--r--harness/tools/genintf.pl9
2 files changed, 5 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="";