attempt to fix init.lua construction in Windows.

more diagnostics to make-init-lua.pl

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25044 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/wslua/Makefile.nmake b/epan/wslua/Makefile.nmake
index 78a221b03f86b4efeb994939b6b52a5df617cb05..5ba45d84b19f8e30b2b8d51ea3623e23e126ca2c 100644 (file)
--- a/epan/wslua/Makefile.nmake
+++ b/epan/wslua/Makefile.nmake
@@ -79,5 +79,5 @@ dummy:
        touch dummy
 
 init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h  ../proto.h
-       $(PERL) make-init-lua.pl "../" template-init.lua > init.lua
+       $(PERL) make-init-lua.pl "." template-init.lua > init.lua
 

diff --git a/epan/wslua/make-init-lua.pl b/epan/wslua/make-init-lua.pl
index 37ad61a6e45b674f6258e17df8241ab45f6fe3f4..7bf6fb30693a28065b4624588472a743fe74ccb4 100755 (executable)
--- a/epan/wslua/make-init-lua.pl
+++ b/epan/wslua/make-init-lua.pl
@@ -54,7 +54,7 @@ my %replacements = %{{
 my $template = '';
 my $template_filename = shift;
 
-open TEMPLATE, "< $template_filename" or die "could not open '$template_filename'";
+open TEMPLATE, "< $template_filename" or die "could not open '$template_filename':  $!";
 $template .= $_ while(<TEMPLATE>);
 close TEMPLATE;
 
@@ -64,7 +64,7 @@ close TEMPLATE;
 
 $wtap_encaps_table = "-- Wiretap encapsulations\nwtap = {\n";
 
-open WTAP_H, "< $WSROOT/wiretap/wtap.h" or die "cannot open '$WSROOT/wiretap/wtap.h'";
+open WTAP_H, "< $WSROOT/wiretap/wtap.h" or die "cannot open '$WSROOT/wiretap/wtap.h':  $!";
 
 while(<WTAP_H>) {
     if ( /^#define WTAP_ENCAP_([A-Z0-9_]+)\s+(\d+)/ ) {
@@ -82,7 +82,7 @@ $ft_types_table = " -- Field Types\nftypes = {\n";
 
 my $ftype_num = 0;
 
-open FTYPES_H, "< $WSROOT/epan/ftypes/ftypes.h" or die "cannot open '$WSROOT/epan/ftypes/ftypes.h'";
+open FTYPES_H, "< $WSROOT/epan/ftypes/ftypes.h" or die "cannot open '$WSROOT/epan/ftypes/ftypes.h':  $!";
 while(<FTYPES_H>) {
     if ( /^\s+FT_([A-Z0-9a-z_]+)\s*,/ ) {
         $ft_types_table .= "\t[\"$1\"] = $ftype_num,\n";
@@ -104,7 +104,7 @@ $expert_pi = "-- Expert flags and facilities\n";
 
 my $base_num = 0;
 
-open PROTO_H, "< $WSROOT/epan/proto.h" or die "cannot open '$WSROOT/epan/proto.h'";
+open PROTO_H, "< $WSROOT/epan/proto.h" or die "cannot open '$WSROOT/epan/proto.h':  $!";
 while(<PROTO_H>) {
        if (/^\s+BASE_([A-Z_]+),/ ) {
                $bases_table .= "\t[\"$1\"] = $base_num,\n";
@@ -122,10 +122,9 @@ close PROTO_H;
 
 
 $menu_groups .= "-- menu groups for register_menu \n";
-$menu_groups .= "-- values obtained from $WSROOT/stat_menu.h \n";
 my $menu_i = 0;
 
-open STAT_MENU, "< $WSROOT/stat_menu.h" or die "cannot open '$WSROOT/stat_menu.h'";
+open STAT_MENU, "< $WSROOT/stat_menu.h" or die "cannot open '$WSROOT/stat_menu.h':  $!";
 while(<STAT_MENU>) {
        if (/REGISTER_([A-Z]+)_GROUP_([A-Z]+)/) {
                $menu_groups .= "MENU_$1_$2 = $menu_i\n";