aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorLars Roland <Lars.Roland@gmx.net>2006-02-07 09:12:43 +0000
committerLars Roland <Lars.Roland@gmx.net>2006-02-07 09:12:43 +0000
commit5f1e470cc2a42387a4b8823f53b826ce8d82b7e5 (patch)
tree59919707a0240a17f3c27533f162ae0ffa6d1fff /packaging
parentbaed8f088844966923d42e056f79dcdfaaa91f36 (diff)
changes to build lua plugin with MSVC6:
- nmake makefile for lua plugin added. - declare variables at the beginning of a function. - proto_reg_handoff_lua was removed, remove remaining calls, too. - missing functions to libethereal.def added. add lua plugin to installer, if available. svn path=/trunk/; revision=17196
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/Makefile.nmake6
-rw-r--r--packaging/nsis/ethereal.nsi11
2 files changed, 17 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index a400e75f80..355bd2ef15 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -76,6 +76,9 @@ 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 \
@@ -144,6 +147,9 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake
!IF "$(ZLIB_DIR)" != ""
/DZLIB_DIR=$(ZLIB_DIR) \
!ENDIF
+!IFDEF LUA_DIR
+ /DLUA_DIR=$(LUA_DIR) \
+!ENDIF
ethereal.nsi
clean:
diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi
index 2d9d82db53..cf3717df30 100644
--- a/packaging/nsis/ethereal.nsi
+++ b/packaging/nsis/ethereal.nsi
@@ -719,6 +719,14 @@ 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"
+SectionEnd
+!endif
+
Section "SNMP MIBs" SecMIBs
;-------------------------------------------
!ifdef GTK1_DIR & GTK2_DIR
@@ -984,6 +992,9 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Plugins with some extended dissections."
!insertmacro MUI_DESCRIPTION_TEXT ${SecStatsTree} "Plugin for some extended statistics."
!insertmacro MUI_DESCRIPTION_TEXT ${SecMate} "Plugin - Meta Analysis and Tracing Engine (Experimental)."
+!ifdef LUA_DIR
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecLua} "Plugin - LUA (Experimental)."
+!endif
!insertmacro MUI_DESCRIPTION_TEXT ${SecMIBs} "SNMP MIBs for better SNMP dissection."
!insertmacro MUI_DESCRIPTION_TEXT ${SecToolsGroup} "Additional command line based tools."
!insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Editcap is a program that reads a capture file and writes some or all of the packets into another capture file."