diff options
| -rw-r--r-- | config.nmake | 4 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 26 | ||||
| -rw-r--r-- | epan/wslua/Makefile.am | 1 | ||||
| -rw-r--r-- | epan/wslua/Makefile.nmake | 102 | ||||
| -rw-r--r-- | epan/wslua/wslua.h | 1 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 3 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 10 | ||||
| -rw-r--r-- | plugins/Makefile.nmake | 1 |
8 files changed, 82 insertions, 66 deletions
diff --git a/config.nmake b/config.nmake index 4e61654225..af07974ff0 100644 --- a/config.nmake +++ b/config.nmake @@ -194,7 +194,7 @@ KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.5 # If you don't have LUA, comment this line out, so that LUA_DIR # isn't defined. # -LUA_DIR=$(WIRESHARK_LIBS)\lua5.1 +LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.1 # # Optional: the PORTAUDIO library enables audio output for RTP streams. @@ -581,7 +581,7 @@ LIBGCRYPT_CONFIG= !IFDEF LUA_DIR LUA_CFLAGS=/I$(LUA_DIR)\include -LUA_LIBS=$(LUA_DIR)\lib\vc6\lua5.1.lib +LUA_LIBS=$(LUA_DIR)\lib\vc6\lua511.lib # Nmake uses carets to escape special characters LUA_CONFIG=^#define HAVE_LUA 1 LUA_VERSION=^#define HAVE_LUA_5_1 1 diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 14b4829bd6..f82a14c6cd 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -26,9 +26,12 @@ libwireshark_LIBS = \ $(ZLIB_LIBS) \ $(GNUTLS_LIBS) \ $(NET_SNMP_LIBS) \ + $(LUA_LIBS) \ + ..\wiretap\wiretap-$(WTAP_VERSION).lib \ $(ICONV_DIR)\lib\iconv.lib \ ftypes\ftypes.lib \ dfilter\dfilter.lib \ + wslua\wslua.lib \ dissectors\dissectors.lib .c.obj:: @@ -50,17 +53,17 @@ DOXYGEN_DEP=doxygen !ENDIF !IFDEF ENABLE_LIBWIRESHARK -all: ftypes dfilter dissectors libwireshark.dll +all: ftypes dfilter wslua dissectors libwireshark.dll !ELSE -all: ftypes dfilter dissectors libwireshark.lib +all: ftypes dfilter wslua dissectors libwireshark.lib !ENDIF # For use when making libwireshark.dll libwireshark.lib: libwireshark.dll libwireshark.exp: libwireshark.dll -libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def ftypes dfilter dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib ..\image\libwireshark.res +libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def ftypes dfilter wslua dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib wslua\wslua.lib ..\image\libwireshark.res @echo Linking libwireshark.dll $(link) $(dlllflags) $(conlibsdll) \ $(LOCAL_LDFLAGS) \ @@ -70,8 +73,8 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def ftypes df dissectors\register.obj \ $(EXTRA_OBJECTS) -libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) ftypes dfilter dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib +libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) ftypes dfilter wslua dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + ftypes\ftypes.lib dfilter\dfilter.lib wslua\wslua.lib dissectors\dissectors.lib link /lib /out:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ $(EXTRA_OBJECTS) @@ -89,6 +92,8 @@ clean: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../dissectors $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean + cd ../wslua + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd .. # @@ -110,6 +115,8 @@ distclean: clean $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../dissectors $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean + cd ../wslua + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd .. maintainer-clean: distclean @@ -119,6 +126,8 @@ maintainer-clean: distclean $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../dissectors $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../wslua + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd .. ftypes:: ..\config.h @@ -136,6 +145,11 @@ dissectors:: ..\config.h $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. +wslua:: ..\config.h + cd wslua + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake + cd .. + doxygen.cfg: ..\config.nmake doxygen.cfg.in sed -e s/@VERSION@/$(VERSION)/ \ < doxygen.cfg.in > $@ diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am index ecc39ff5f3..a81d9f8dd2 100644 --- a/epan/wslua/Makefile.am +++ b/epan/wslua/Makefile.am @@ -44,6 +44,7 @@ libwslua_la_SOURCES = \ libwslua_la_LIBADD = @LUA_LIBS@ BUILT_SOURCES = \ + taps.c-inc \ wslua_register.h pkgdata_DATA = init.lua diff --git a/epan/wslua/Makefile.nmake b/epan/wslua/Makefile.nmake index 497ab2eebe..f66242e9f1 100644 --- a/epan/wslua/Makefile.nmake +++ b/epan/wslua/Makefile.nmake @@ -6,64 +6,78 @@ include ..\..\config.nmake ############### no need to modify below this line ######### -CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) $(LUA_CFLAGS)\ +CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) $(LUA_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) -LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) +CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL -!IFDEF LUA_DIR -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS) +.c.obj:: + $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $< -MODULES= \ - elua_dumper.c \ - elua_field.c \ - elua_gui.c \ - elua_pinfo.c \ - elua_proto.c \ - elua_tap.c \ - elua_tree.c \ - elua_tvb.c \ - elua_util.c +MODULES = \ + wslua_tvb.c \ + wslua_proto.c \ + wslua_tree.c \ + wslua_pinfo.c \ + wslua_listener.c \ + wslua_gui.c \ + wslua_util.c \ + wslua_field.c \ + wslua_dumper.c OBJECTS= \ - elua.obj \ - elua_dumper.obj \ - elua_field.obj \ - elua_gui.obj \ - elua_pinfo.obj \ - elua_plugin.obj \ - elua_proto.obj \ - elua_tap.obj \ - elua_tree.obj \ - elua_tvb.obj \ - elua_util.obj + init_wslua.obj \ + wslua_dumper.obj \ + wslua_field.obj \ + wslua_gui.obj \ + wslua_pinfo.obj \ + wslua_proto.obj \ + wslua_listener.obj \ + wslua_tree.obj \ + wslua_tvb.obj \ + wslua_util.obj + +wslua.lib : $(OBJECTS) init.lua + link /lib /NODEFAULTLIB /out:wslua.lib $(OBJECTS) -lua.dll lua.exp lua.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) - link -dll /out:lua.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(LUA_LIBS) ..\..\wiretap\wiretap-$(WTAP_VERSION).lib +clean: + rm -f $(OBJECTS) wslua.lib $(PDB_FILE) init.lua taps.c-inc +init_wslua.c: wslua_register.h -elua_register.h: elua_makereg.pl $(MODULES) - $(PERL) elua_makereg.pl $(MODULES) > elua_register.h +distclean: clean -elua.c: elua_register.h +maintainer-clean: distclean -doc: $(MODULES) - $(PERL) elua_makedoc.pl $(MODULES) +TAPS_USED = \ + ../dissectors/packet-http.h \ + ../dissectors/packet-ip.h \ + ../dissectors/packet-udp.h \ + ../dissectors/packet-h225.h -#elua.c: $(LUA_LIBS) +taps: $(TAPS_USED) + touch taps -init.lua: template-init.lua make-init-lua.pl ../../epan/ftypes/ftypes.h ../../wiretap/wtap.h ../../epan/proto.h - $(PERL) make-init-lua.pl template-init.lua > init.lua +taps.c-inc: make-taps.pl taps + $(PERL) make-taps.pl taps taps.c-inc taps.txt -!ENDIF -!ENDIF +wslua_listener.c: taps.c-inc -clean: - rm -f $(OBJECTS) lua.dll lua.exp lua.lib *.pdb init.lua +taps.txt: taps.c-inc + +wslua.h: wslua_register.h + +# do not do not unnecessarilly modify the old file in order avoid recompiling every module every time +wslua_register.h: make-reg.pl $(MODULES) + $(PERL) make-reg.pl $(MODULES) > wslua_register.h + +doc: $(MODULES) + $(PERL) make-doc.pl $(MODULES) + +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 -distclean: clean -maintainer-clean: distclean diff --git a/epan/wslua/wslua.h b/epan/wslua/wslua.h index 6b87bb490d..d68e0522b8 100644 --- a/epan/wslua/wslua.h +++ b/epan/wslua/wslua.h @@ -225,7 +225,6 @@ int dummy##C #define WSLUA_REGISTER_META(C) luaL_newmetatable (L, #C); luaL_register (L, NULL, C ## _meta); #define WSLUA_INIT(L) \ - L = luaL_newstate(); \ luaL_openlibs(L); \ WSLUA_REGISTER_CLASSES(); \ WSLUA_REGISTER_FUNCTIONS(); diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index e929ae4683..a9e8c46217 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -76,9 +76,6 @@ PLUGINS=../../plugins/acn/acn.dll \ ../../plugins/gryphon/gryphon.dll \ ../../plugins/h223/h223.dll \ ../../plugins/irda/irda.dll \ -!IFDEF LUA_DIR - ../../plugins/lua/lua.dll \ -!ENDIF ../../plugins/lwres/lwres.dll \ ../../plugins/mate/mate.dll \ ../../plugins/megaco/megaco.dll \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 5f10ebaf1a..d5c77259bd 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -340,6 +340,7 @@ File "..\..\doc\wireshark.html" File "..\..\doc\wireshark-filter.html" File "..\..\dumpcap.exe" File "..\..\doc\dumpcap.html" +File "..\..\epan\wslua\init.lua" ; global config files - don't overwrite if already existing ;IfFileExists cfilters dont_overwrite_cfilters @@ -744,15 +745,6 @@ SetOutPath $INSTDIR\plugins\${VERSION} File "..\..\plugins\mate\mate.dll" SectionEnd -!ifdef LUA_DIR -Section "LUA Plugin" SecLua -;------------------------------------------- -SetOutPath $INSTDIR\plugins\${VERSION} -File "..\..\plugins\lua\lua.dll" -SetOutPath $INSTDIR -File "..\..\plugins\lua\init.lua" -SectionEnd -!endif Section "SNMP MIBs" SecMIBs ;------------------------------------------- diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake index e232f11e76..44408405db 100644 --- a/plugins/Makefile.nmake +++ b/plugins/Makefile.nmake @@ -18,7 +18,6 @@ all: \ gryphon \ h223 \ irda \ - lua\ lwres \ mate \ megaco \ |