summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/HPMHookGen/HPMDataCheckGen.pl1
-rwxr-xr-xtools/HPMHookGen/HPMHookGen.pl16
-rw-r--r--tools/HPMHookGen/doxygen.conf6
-rw-r--r--tools/Script-Checker.applescript2
-rwxr-xr-xtools/itemdbconverter.pl2
-rwxr-xr-xtools/questdbconverter.pl2
6 files changed, 16 insertions, 13 deletions
diff --git a/tools/HPMHookGen/HPMDataCheckGen.pl b/tools/HPMHookGen/HPMDataCheckGen.pl
index 06b58127a..0e5f628cd 100644
--- a/tools/HPMHookGen/HPMDataCheckGen.pl
+++ b/tools/HPMHookGen/HPMDataCheckGen.pl
@@ -26,6 +26,7 @@ foreach my $file (@files) {
next if $data->{compounddef}->{$filekey}->{compoundname}->[0] =~ /::/; # its a duplicate with a :: name e.g. struct script_state {<...>} ay;
my @filepath = split(/[\/\\]/, $data->{compounddef}->{$filekey}->{location}->[0]->{file});
my $foldername = uc($filepath[-2]);
+ next if $filepath[-1] eq "HPM.h"; # Skip the HPM core, plugins don't need it
my $filename = uc($filepath[-1]); $filename =~ s/-/_/g; $filename =~ s/\.[^.]*$//;
my $plugintypes = 'SERVER_TYPE_UNKNOWN';
$plugintypes = 'SERVER_TYPE_ALL' if $foldername eq 'COMMON';
diff --git a/tools/HPMHookGen/HPMHookGen.pl b/tools/HPMHookGen/HPMHookGen.pl
index 4fa548e44..a77b50a3b 100755
--- a/tools/HPMHookGen/HPMHookGen.pl
+++ b/tools/HPMHookGen/HPMHookGen.pl
@@ -21,6 +21,7 @@ sub trim($) {
sub parse($$) {
my ($p, $d) = @_;
+
$p =~ s/^.*?\)\((.*)\).*$/$1/; # Clean up extra parentheses )(around the arglist)
# Retrieve return type
@@ -279,19 +280,20 @@ foreach my $file (@files) { # Loop through the xml files
$key = "inter_homunculus";
} elsif ($key =~ /homunculus/) {
$key = "homun";
- } elsif ($key =~ /irc_bot/) {
+ } elsif ($key eq "irc_bot_interface") {
$key = "ircbot";
- } elsif ($key =~ /log_interface/) {
+ } elsif ($key eq "log_interface") {
$key = "logs";
- } elsif ($key =~ /pc_groups_interface/) {
+ } elsif ($key eq "pc_groups_interface") {
$key = "pcg";
- } elsif ($key =~ /char_interface/) {
+ } elsif ($key eq "char_interface") {
$key = "chr";
} else {
$key =~ s/_interface//;
}
- foreach my $v ($data->{compounddef}->{$filekey}->{sectiondef}->[0]) { # Loop through the sections
+ my $sectiondef = $data->{compounddef}->{$filekey}->{sectiondef};
+ foreach my $v (@$sectiondef) { # Loop through the sections
my $memberdef = $v->{memberdef};
foreach my $f (sort { # Sort the members in declaration order according to what the xml says
my $astart = $a->{location}->[0]->{bodystart} || $a->{location}->[0]->{line};
@@ -419,7 +421,7 @@ EOF
EOF
$idx += 2;
- $maxlen = length($key."->".$if->{name}) if( length($key."->".$if->{name}) > $maxlen )
+ $maxlen = length($key."->".$if->{name}) if( length($key."->".$if->{name}) > $maxlen );
}
}
print FH <<"EOF";
@@ -464,7 +466,7 @@ EOF
foreach my $key (@$keysref) {
print FH <<"EOF";
-if( !($key = GET_SYMBOL("$exportsymbols{$key}") ) ) return false;
+if( !($key = GET_SYMBOL("$exportsymbols{$key}") ) ) return "$exportsymbols{$key}";
EOF
}
close FH;
diff --git a/tools/HPMHookGen/doxygen.conf b/tools/HPMHookGen/doxygen.conf
index b6dc7444b..3a848abe4 100644
--- a/tools/HPMHookGen/doxygen.conf
+++ b/tools/HPMHookGen/doxygen.conf
@@ -34,8 +34,8 @@ IDL_PROPERTY_SUPPORT = NO
DISTRIBUTE_GROUP_DOC = NO
SUBGROUPING = NO
TYPEDEF_HIDES_STRUCT = NO
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = NO
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = YES
EXTRACT_STATIC = NO
EXTRACT_LOCAL_CLASSES = NO
EXTRACT_LOCAL_METHODS = NO
@@ -178,7 +178,7 @@ EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES
INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
-PREDEFINED =
+PREDEFINED = __attribute__(x)=
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = NO
TAGFILES =
diff --git a/tools/Script-Checker.applescript b/tools/Script-Checker.applescript
index db1983f4b..eb4e7629a 100644
--- a/tools/Script-Checker.applescript
+++ b/tools/Script-Checker.applescript
@@ -1,7 +1,7 @@
(*
Copyright (c) Hercules Dev Team, licensed under GNU GPL.
See the LICENSE file
- Base Author: Haru @ http://hercules.ws
+ Base Author: Haru @ http://herc.ws
*)
(*
diff --git a/tools/itemdbconverter.pl b/tools/itemdbconverter.pl
index 13805c09e..9486308a6 100755
--- a/tools/itemdbconverter.pl
+++ b/tools/itemdbconverter.pl
@@ -2,7 +2,7 @@
#
# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
# See the LICENSE file
-# Base Author: Haru @ http://hercules.ws
+# Base Author: Haru @ http://herc.ws
#
# This script converts an item_db(2).txt to the new item_db(2).conf format.
# usage example: perl tools/itemdbconverter.pl < db/item_db2.txt > db/item_db2.conf
diff --git a/tools/questdbconverter.pl b/tools/questdbconverter.pl
index 00431fb79..49e7b76bf 100755
--- a/tools/questdbconverter.pl
+++ b/tools/questdbconverter.pl
@@ -2,7 +2,7 @@
#
# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
# See the LICENSE file
-# Base Author: Dastgir @ http://hercules.ws
+# Base Author: Dastgir @ http://herc.ws
#
# This Script converts quest_db.txt to quest_db.conf format.
# usage example: perl tools/questdbconverter.pl < db/quest_db.txt > db/quest_db.conf