757aa33220
Continue to remove $Id$ from top of file
...
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)
Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
a1d4189c5e
Upgrade Windows builds to Lua 5.2.1
...
Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e
Reviewed-on: https://code.wireshark.org/review/863
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-29 16:30:53 +00:00
988a184603
Added Cisco Starent Diameter dictionary entries.
...
Change-Id: Ib7fa98639b6de965148349948ccf86d8c8641fb1
Reviewed-on: https://code.wireshark.org/review/438
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-02 18:18:53 +00:00
644d6fe8ea
Fix warning when use make packaging on Windows
...
warning: unknown variable/constant "{PROGRAM_NAME_PATH_GTK}" detected, ignoring (macro:MUI_FUNCTION_FINISHPAGE:387)
svn path=/trunk/; revision=54634
2014-01-07 22:36:01 +00:00
a051efea06
Fix indent (use 4 spaces)
...
svn path=/trunk/; revision=54606
2014-01-05 18:16:22 +00:00
76c9fc03bb
Enhance NSIS Windows installer (Wireshark Qt support)
...
* Add Radiobox to choose File Association (Wireshark GTK or Qt)
* Add Checkbox to choose Wireshark Qt icon will be installed (Startup, Desktop...)
* Fix unistaller (don't remove all icons...)
* ...
svn path=/trunk/; revision=54604
2014-01-05 17:16:03 +00:00
24b377b51f
Don't try to distribute asn1.dll since we no longer build it.
...
svn path=/trunk/; revision=54566
2014-01-02 19:47:03 +00:00
643b572665
Stop building and distributing the asn1 plugin. I bleleve it to be obsolete.
...
svn path=/trunk/; revision=54559
2014-01-02 17:47:34 +00:00
0c73eb6808
Update the example to match the ohter plugins in wireshark.nsi.
...
svn path=/trunk/; revision=54230
2013-12-18 20:00:06 +00:00
a81424382e
Be more consistent with the name "Wireshark" and its two UI
...
flavors. Upgrade the Qt flavor from "experimental" to "alpha". I also
apologize in advance to all of the people who installed previous versions
of the 1.11.x packages and who will now have extra shortcuts lying around.
svn path=/trunk/; revision=53952
2013-12-11 22:29:05 +00:00
244000000d
- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying
...
pcap probably is different from the WinPcap version.
- Set WINPCAP_VERSION for cmake builds to "unknown"
- Oh, the NEWS file changed again.
svn path=/trunk/; revision=53690
2013-12-01 10:05:16 +00:00
1745e131fc
Create a plural-only English translation. Use it to pluralize the Follow
...
Stream and Flow Graph hint statistics.
svn path=/trunk/; revision=53326
2013-11-14 22:35:10 +00:00
628dda9d2c
From Michael Bean via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9384 :
...
Add support for Alcatel-Lucent 8950 AAA
svn path=/trunk/; revision=53258
2013-11-11 21:13:55 +00:00
2c85824a46
From bkpsu via bug 9374:
...
Minor grammar error in the NSIS installer script messageBox for
"isRunning" section. "one is associated" should be changed to "one of
its associated"
svn path=/trunk/; revision=53050
2013-11-02 16:17:23 +00:00
69473b4645
Use a plain package name even if we're building with GTK3. Hopefully
...
we're beyond the "experimental" stage now.
svn path=/trunk/; revision=52453
2013-10-08 20:21:36 +00:00
956844f335
Update a link.
...
svn path=/trunk/; revision=52026
2013-09-13 21:59:24 +00:00
f13c30d2c4
Per http://nsis.sourceforge.net/Docs/Chapter4.html#4.2.4 , we need to use $\n for a newline in strings. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9103 .
...
#BACKPORT(1.10,1.8)
svn path=/trunk/; revision=51788
2013-09-05 17:51:17 +00:00
789a4060da
Qt5 on Windows needs platforms/qwindows.dll as well.
...
svn path=/trunk/; revision=51609
2013-08-31 04:18:42 +00:00
36ff508507
Try to fix PortableApps packaging. Note that the Qt definitions should
...
be in config.nmake along with everything else.
svn path=/trunk/; revision=51598
2013-08-30 15:55:12 +00:00
2e857954a3
Fix NSIS packaging.
...
svn path=/trunk/; revision=51583
2013-08-30 00:43:51 +00:00
61d2e64163
Make it possible to add custom Diameter AVP .xml files and distribute them by adding the file name to separate files and leave the "normal" makefiles untouched.
...
svn path=/trunk/; revision=51457
2013-08-21 19:53:57 +00:00
35e220513c
Make it easier to add custom (proprietary) Diameter XML files.
...
svn path=/trunk/; revision=50889
2013-07-25 15:40:39 +00:00
d64dbd371b
From Anders: add Verizon Wireless dictionary
...
svn path=/trunk/; revision=50726
2013-07-18 09:27:10 +00:00
ce088c334d
makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
...
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
693bcb654c
Have the NSIS installer run the existing uninstaller silently. This
...
should save a few mouse clicks during the installation process.
svn path=/trunk/; revision=49813
2013-06-06 19:04:46 +00:00
1a95757f46
I suspect "ie4uinit" got its name because "mysterious useful undocumented
...
system utility" would have been too obvious. Have UpdateIcons call
"ie4uinit -ClearIconCache" and move UpdateIcons to the "-{,Un.}Finally"
sections in the installer and uninstaller.
svn path=/trunk/; revision=49811
2013-06-06 18:46:37 +00:00
a6cd9fdc44
Change the right title this time.
...
svn path=/trunk/; revision=49126
2013-05-01 22:22:10 +00:00
b38556fa1e
Use "Global" to match the other entries.
...
svn path=/trunk/; revision=49125
2013-05-01 22:14:48 +00:00
dd83985381
Profiles → Global Profiles.
...
svn path=/trunk/; revision=49124
2013-05-01 22:13:51 +00:00
4b4542045c
Install and uninstall our global profiles.
...
svn path=/trunk/; revision=49123
2013-05-01 22:06:49 +00:00
fd13812247
Add China Telecom AVP:s to Windows installer
...
svn path=/trunk/; revision=49018
2013-04-24 18:04:33 +00:00
d18230de70
Install QtShark by default.
...
svn path=/trunk/; revision=49001
2013-04-23 18:32:11 +00:00
035d5b231e
Use a larger LZMA dictionary.
...
svn path=/trunk/; revision=48328
2013-03-15 21:46:25 +00:00
a7cef5b7c8
Prettify the WinPcap version display.
...
svn path=/trunk/; revision=48250
2013-03-11 19:12:17 +00:00
7613251d1c
Switch to WinPcap 4.1.3.
...
svn path=/trunk/; revision=48207
2013-03-09 01:20:09 +00:00
a606a88647
Add /SD defaults to every MessageBox call (even if they're commented
...
out). Fixes bug 8451.
Don't yell at the user so much.
svn path=/trunk/; revision=48196
2013-03-08 18:23:58 +00:00
75847e552a
"HKEY_CURRENT_USER\Software\The Wireshark developer community, http://www.wireshark.org/\Wireshark\WinSparkle " isn't the prettiest registry path.
...
svn path=/trunk/; revision=48089
2013-03-05 18:46:50 +00:00
c1963df0a7
Remove vcredist_??.exe when we're done with it.
...
svn path=/trunk/; revision=47788
2013-02-21 01:03:47 +00:00
63ef23bf5f
Pop into the correct variable.
...
svn path=/trunk/; revision=47786
2013-02-21 00:55:25 +00:00
ab79e59866
Move the Wireshark-is-running check to a common macro and call it in
...
both the installer and uninstaller. Roll the .exe removal code into a
loop and add missing executables.
Add modelines and adjust accordingly.
svn path=/trunk/; revision=47785
2013-02-20 23:59:49 +00:00
3ba2c108f1
As http://www.jrsoftware.org/iskb.php?mutexsessions points out, a session
...
mutex may not be visible to other sessions and we may not be able to
create a global mutex. Try to create both, and make each one accessible
to all users. Update the NSIS installer to check for both global and
session mutexes.
svn path=/trunk/; revision=47773
2013-02-20 19:58:55 +00:00
bd4cffae58
When any of our executables start on Windows create or open a "Wireshark
...
is running" mutex. Have the NSIS installer check for this mutex and ask
the user to close Wireshark if it's found. While not perfect this makes
the WinSparkle update process much less annoying.
svn path=/trunk/; revision=47758
2013-02-20 01:19:42 +00:00
e48236a436
Add automatic software update checks for Win32 using WinSparkle. Add
...
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.
svn path=/trunk/; revision=47748
2013-02-19 22:21:17 +00:00
a22790ae51
Use the same destination directory everywhere. If we're building an NSIS
...
package, assume that we're doing a "release" build.
svn path=/trunk/; revision=47615
2013-02-10 19:45:43 +00:00
bbb0e8f802
Add an SKT.xml file.
...
svn path=/trunk/; revision=47227
2013-01-23 14:50:57 +00:00
fceeb16e66
Make it possible to add custom radius dictionaries. Top Makefile.am needs more modifications to include the file in the tarball.
...
svn path=/trunk/; revision=47224
2013-01-23 12:08:15 +00:00
fc22650de4
Update Dictonary from FreeRadius(-server) Master branch https://github.com/FreeRADIUS/freeradius-server
...
Add RFC 5447 dictionary
9b98830314383a9971818cc6e5a04d
2012-12-23 18:40:40 +00:00
4ca2e780bf
Fix trivial typo.
...
svn path=/trunk/; revision=46448
2012-12-07 20:02:01 +00:00
f5b9238ed6
Make list of file extensions to register display properly, using 3 text
...
lines rather than 2. Add 2 new extensions to common.nsh.
Not sure if changes to wireshark.ini are necessary, copied what was done
for "Field 7", which is also just a label.
svn path=/trunk/; revision=46337
2012-12-02 23:55:44 +00:00
b924cfed2b
The U3 and PortableApps packaging processes depend on simple
...
defined/undefined checks. Create a bunch of them corresponding to the
various components that GTK2 and GTK3 need and plumb the packaging files
accordingly. Tested only with GTK2 but GTK3 *should* work.
svn path=/trunk/; revision=45659
2012-10-19 17:47:34 +00:00
df44255d07
- Use PROGRAM_NAME in the unistaller too.
...
- Make it possible to set PROGRAM_NAME in environment.
- Update the comment about setting program name it *should* work now.
svn path=/trunk/; revision=45582
2012-10-16 14:03:42 +00:00
688ffbb464
Use PROGRAM_NAME in more places.
...
Missing fro previous commit.
svn path=/trunk/; revision=45576
2012-10-16 08:16:40 +00:00
83092dca63
Use PROGRAM_NAME in more places.
...
svn path=/trunk/; revision=45575
2012-10-16 08:08:18 +00:00
0a1bbd5526
Typos.
...
svn path=/trunk/; revision=45557
2012-10-15 12:50:20 +00:00
58066cd222
See if we can build u3 pacakage with GTK3.
...
svn path=/trunk/; revision=45552
2012-10-15 08:03:44 +00:00
a3f65d3680
Try a experimental gtk3 build
...
svn path=/trunk/; revision=45551
2012-10-15 06:12:51 +00:00
f8d36704a8
Revert back to GTK2
...
svn path=/trunk/; revision=45541
2012-10-14 19:16:34 +00:00
091559e2ab
Try a experimental gtk3 build
...
svn path=/trunk/; revision=45540
2012-10-14 18:42:02 +00:00
f1939f9442
Add 2 new file extension associations, and restore alphabetical order.
...
svn path=/trunk/; revision=45522
2012-10-13 19:39:05 +00:00
ea4f518997
Add Qtshark to Windows Installer (NSIS)
...
Detect if ./wireshark-qt/qtshark.exe is present and add a option to install Qtshark (Experimental), also add a shortcut.
The option to install qtshark is disable by default (for the moment...)
Now qtshark is (normally) available in automated build !
svn path=/trunk/; revision=45485
2012-10-11 20:45:35 +00:00
f0472792e2
- Add Nokai Siemens Networks AVP.
...
- Add a few enums to Event-Trigger
- Reformat the Nokia file a bit.
svn path=/trunk/; revision=45427
2012-10-09 14:10:31 +00:00
9f38a46974
From GeorgiaK:
...
Add Nokia AVP:s
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7799
svn path=/trunk/; revision=45385
2012-10-08 14:20:34 +00:00
05570017ba
Include reordercap.exe.
...
svn path=/trunk/; revision=45096
2012-09-24 11:59:49 +00:00
359335be9a
Add AlcatelLucent.xml to NSIS installer
...
svn path=/trunk/; revision=45075
2012-09-23 20:12:46 +00:00
1b1a1e6a3e
Remove our local copy of WinPcap and download it from
...
wireshark-win{32,64}-libs instead. In win-setup.sh only try to unzip
files ending in .zip. PortableApps and U3 packaging changes are untested.
svn path=/trunk/; revision=44888
2012-09-13 21:28:28 +00:00
4507b5ed3a
Remove a hard-coded path.
...
svn path=/trunk/; revision=44085
2012-07-27 23:30:44 +00:00
f25ae3613a
Fix the dependencies for wireshark.exe and tshark.exe and use "xcopy
...
/d" instead of "copy" in Makefile.nmake. Fix the uninstall.exe path in
packaging\nsis\Makefile.nmake. This keeps us from clobbering existing
files in wireshark-gt2 unnecessarily.
svn path=/trunk/; revision=43976
2012-07-24 23:59:42 +00:00
8d050c2828
Remove uninstall_installer.exe when we're done with it so that we don't
...
have an extraneous executable in the staging directory.
svn path=/trunk/; revision=43965
2012-07-24 16:30:03 +00:00
69b1c2dd84
Add a comment.
...
svn path=/trunk/; revision=43866
2012-07-20 18:04:00 +00:00
6b04299ae4
According to
...
http://blogs.msdn.com/b/astebner/archive/2010/10/20/10078468.aspx
and bug 7507 the Visual C++ 2010 redistributable installer might want
to reboot the system. Tell it not to do that and request a reboot at
the end of the installation process if needed.
svn path=/trunk/; revision=43864
2012-07-20 17:56:16 +00:00
1ec2f43f2c
WiMAX OFDMA PHY SAP dissector plugin ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695 )
...
svn path=/trunk/; revision=43844
2012-07-20 01:21:27 +00:00
78527f225d
Make it possible to add custom/private MIBs to the Windows installer.
...
svn path=/trunk/; revision=43819
2012-07-19 08:02:50 +00:00
1785ed1ee0
Try to fix tarball compilation on Windows.
...
svn path=/trunk/; revision=43428
2012-06-21 17:35:59 +00:00
aab480d191
Followup to r43370: don't install idl2wrs or its man page.
...
svn path=/trunk/; revision=43377
2012-06-19 17:32:49 +00:00
2592e50101
Don't install main-menubar-ui.xml
...
svn path=/trunk/; revision=43368
2012-06-19 14:54:11 +00:00
089a048d4d
Add back an absolute path prefix.
...
svn path=/trunk/; revision=43264
2012-06-14 19:49:57 +00:00
7931a2baf6
More NSIS cleanup.
...
svn path=/trunk/; revision=43261
2012-06-14 18:53:55 +00:00
bcb021c25f
Define STAGING_DIR and use it in various places instead of hard-coding
...
"..\.." or "..\..\wireshark-gtk2".
svn path=/trunk/; revision=43239
2012-06-13 21:03:54 +00:00
c548b1097f
Use terminology that conforms better with the MSDN documentation and a
...
style that conforms better with the rest of the NSIS output.
svn path=/trunk/; revision=43237
2012-06-13 20:11:41 +00:00
a9cb4061d4
Move the "uninstall" parts of wireshark.nsi to uninstall.nsi and the
...
common parts to common.nsh. Creating an installer now requires two
NSIS runs:
- uninstaller.nsi, which creates an installer (uninstall_installer.exe)
that only writes uninstall.exe to ../../wireshark-gtk2.
- wireshark.nsi, which bundles uninstall.exe along with the rest of
our installation files.
If we ever get around to signing our executables this will let us sign
all of them. It also cleans up the .nsi file contents a bit.
Instead of keeping separate list of file extensions, manage them from
a single macro. Print the extensions we register / deregister in the
detail pane.
svn path=/trunk/; revision=43236
2012-06-13 19:06:27 +00:00
3be09ce941
Add TGPPS9.xml to makefile and NSIS installer
...
svn path=/trunk/; revision=43202
2012-06-11 13:48:11 +00:00
b018e77f7b
No more GIOP plugins, no more GIOP loadable DLL.
...
svn path=/trunk/; revision=42981
2012-06-01 17:11:00 +00:00
9d6d0cf275
Replace IDL generated dissector with common dll
...
svn path=/trunk/; revision=42926
2012-05-30 19:03:56 +00:00
43670460ff
Use GeoIP 1.4.8 which includes a DLL instead of a static library.
...
svn path=/trunk/; revision=42905
2012-05-29 23:31:00 +00:00
992587c3bf
Try using an OBS-derived Gtk2 bundle, second try.
...
svn path=/trunk/; revision=42623
2012-05-14 17:54:47 +00:00
ed15123049
Add .ntar as a suffix (some pcap-ng files use it).
...
Sort the suffixes alphabetically.
svn path=/trunk/; revision=42329
2012-04-29 02:38:55 +00:00
733834afdb
Switch back to the gtk.org version of the GTK+ bundle since its Cairo
...
doesn't crash.
svn path=/trunk/; revision=42171
2012-04-20 23:41:36 +00:00
d8389b5429
Switch to our custom GTK+ bundles derived from openSUSE Build Service
...
packages. Sort and normalize our DLL lists. Add several new required DLLs.
svn path=/trunk/; revision=42143
2012-04-19 18:31:11 +00:00
16a4af2d67
Add and update a bunch of Programs and Features-related registry
...
keys. Sort the keys by name. Calculate the installation size after all
of the files have been installed and add that in the "EstimatedSize"
key. Fix the display icon. Add a hint about our target platform. Add
version information.
We now look like a grown-up application in the Programs and Features
control panel.
svn path=/trunk/; revision=41914
2012-04-04 00:47:21 +00:00
0ef57966fc
Update a couple of keys.
...
svn path=/trunk/; revision=41832
2012-03-29 20:22:50 +00:00
98080036b6
Capitalize "Wireshark" in various package names.
...
svn path=/trunk/; revision=41621
2012-03-16 17:36:40 +00:00
d23c469785
Rename the Xylan dictionnary to Alcatel-Lucent Xylan dictionnary
...
Alcatel (now Alcatel-Lucent) buy Xylan in 1999...
And now Attributs RADIUS is used in Alcatel-Lucent Omniswitch Product.
svn path=/trunk/; revision=41474
2012-03-10 18:30:20 +00:00
be706c6380
Move gtk to ui/gtk.
...
This looses the last checkin to gtk, will add this manually back.
svn path=/trunk/; revision=40518
2012-01-15 21:59:11 +00:00
1fc129282b
Remove some NSIS 1.x cruft.
...
svn path=/trunk/; revision=40318
2011-12-28 22:42:40 +00:00
5ce69a0445
Simplify wireshark.nsi a bit by copying DLLs from the wireshark-gtk2
...
directory. This picks up any DEP/ASLR-related changes. Run peflags on
more DLLs.
svn path=/trunk/; revision=40317
2011-12-28 22:37:38 +00:00
5198e05412
Remove the obsolete files fom the installer
...
svn path=/trunk/; revision=38816
2011-08-31 10:25:57 +00:00
a08c67c558
Add the main menubar UI description.
...
svn path=/trunk/; revision=38762
2011-08-28 18:34:52 +00:00
3b203417d5
Add the treeView popup UI description.
...
svn path=/trunk/; revision=38760
2011-08-28 16:18:58 +00:00
65c3879f2d
Install the GUI xml files. I'm not sure about the Makefile.am changes pkease check.
...
svn path=/trunk/; revision=38756
2011-08-28 15:08:31 +00:00
1f497af628
Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake
...
use WIRESHARK_LIB_DIR for the location of our external libraries.
svn path=/trunk/; revision=38119
2011-07-19 18:22:46 +00:00
Alexis La Goutte