diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-04-12 19:41:39 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-04-12 17:44:06 +0000 |
| commit | 4ef6e241c49016ec62d7145007c8a3e249297040 (patch) | |
| tree | 612e71814c3c832076667a5cfc5d79401ebb7dde /packaging/nsis | |
| parent | 56470cc80151345fbaf0551a0f7be60a228a4074 (diff) | |
Windows: do not install androiddump by default
It adds a delay on startup and is verbose on command line when Android SDK is not installed
Change-Id: I165358ff14ef458712ebaa12bd3c7256f657e238
Reviewed-on: https://code.wireshark.org/review/8035
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index a0071b01af..4af80f7b58 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -978,14 +978,6 @@ File "${STAGING_DIR}\capinfos.exe" File "${STAGING_DIR}\capinfos.html" SectionEnd -Section "Androiddump" SecAndroiddumpinfos -;------------------------------------------- -SetOutPath $INSTDIR\extcap -File "${STAGING_DIR}\androiddump.html" -File "${STAGING_DIR}\extcap\androiddump.exe" -File "${STAGING_DIR}\extcap\*.dll" -SectionEnd - Section "Rawshark" SecRawshark ;------------------------------------------- SetOutPath $INSTDIR @@ -993,6 +985,14 @@ File "${STAGING_DIR}\rawshark.exe" File "${STAGING_DIR}\rawshark.html" SectionEnd +Section /o "Androiddump" SecAndroiddumpinfos +;------------------------------------------- +SetOutPath $INSTDIR\extcap +File "${STAGING_DIR}\androiddump.html" +File "${STAGING_DIR}\extcap\androiddump.exe" +File "${STAGING_DIR}\extcap\*.dll" +SectionEnd + SectionGroupEnd ; "Tools" !ifdef USER_GUIDE_DIR |