diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-06-27 20:48:26 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-06-27 20:48:26 +0000 |
| commit | add36f416d9ec497a8ad95541482ca7037d5da4a (patch) | |
| tree | 179d40889f914161b8b4095f3b2b81773c40a986 /packaging | |
| parent | 741c973afede397e2801e2f7c6e797dae7ed41b8 (diff) | |
Use the latest libsmi package. Note that we now support OID resolution
on 64-bit Windows.
svn path=/trunk/; revision=37808
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index ed0919390d..ce60466aff 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -414,7 +414,7 @@ File "..\..\epan\wslua\console.lua" File "..\..\epan\wslua\dtd_gen.lua" !endif !ifdef SMI_DIR -File "${SMI_DIR}\lib\smi.dll" +File "${SMI_DIR}\bin\libsmi-2.dll" !endif File "..\..\wireshark-gtk2\COPYING.txt" File "..\..\wireshark-gtk2\NEWS.txt" @@ -934,19 +934,16 @@ File "..\..\plugins\mate\mate.dll" SectionEnd -!ifdef NET_SNMP_DIR -Section "SNMP MIBs" SecMIBs -;------------------------------------------- -SetOutPath $INSTDIR\snmp\mibs -File "${NET_SNMP_DIR}\mibs\*.txt" -SectionEnd -!endif - !ifdef SMI_DIR Section "SNMP MIBs" SecMIBs ;------------------------------------------- SetOutPath $INSTDIR\snmp\mibs -File "${SMI_DIR}\mibs\*" +File "${SMI_DIR}\share\mibs\iana\*" +File "${SMI_DIR}\share\mibs\ietf\*" +File "${SMI_DIR}\share\mibs\irtf\*" +File "${SMI_DIR}\share\mibs\tubs\*" +File "${SMI_DIR}\share\pibs\*" +File "${SMI_DIR}\share\yang\*.yang" SectionEnd !endif @@ -1236,9 +1233,6 @@ 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 NET_SNMP_DIR - !insertmacro MUI_DESCRIPTION_TEXT ${SecMIBs} "SNMP MIBs for better SNMP dissection." -!endif !ifdef SMI_DIR !insertmacro MUI_DESCRIPTION_TEXT ${SecMIBs} "SNMP MIBs for better SNMP dissection." !endif |