Commit Graph

63 Commits

Author SHA1 Message Date
Pascal Quantin a8efae3be5 Do not package debug files when building PortableApps.com installer with (the soon to be dead) nmake
Change-Id: Ifd6fc71cebe6db06923e2d764cb415bf5b2ed025
Reviewed-on: https://code.wireshark.org/review/8106
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-17 08:40:38 +00:00
Gerald Combs 40ce324f4d Set the extcap working directory on Windows.
On Windows, prepend the main program directory to %Path% when spawning
extcap processes. This lets us place androiddump in extcap while allowing
it to locate its DLLs.

Change-Id: I406c47ce71323266d5f14fb596931398464e452d
Reviewed-on: https://code.wireshark.org/review/8057
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15 20:26:13 +00:00
Gerald Combs 495740f801 CMake: Initial PortableApps targets.
Add portableapps_app_dir and portableapps_package targets.

Change-Id: Ifea3d952eef0e267de6364999d45807236d99102
Reviewed-on: https://code.wireshark.org/review/8025
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14 19:11:50 +00:00
Pascal Quantin 0c700d8958 Windows: fix generation of PortableApps.com installer
Change-Id: I249268ce21ddfbdc7f149609a950736b4fe2ae07
Reviewed-on: https://code.wireshark.org/review/8036
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-12 21:30:54 +00:00
Michal Labedzki 56470cc801 Add missing androiddump stuff
Add missing androiddump stuff like:
- release notes
- documentation
- Windows nmake support
- running androiddump as a windows application instead of console on Windows
- addition of androiddump to the Windows installer

Change-Id: I3bc6cc70e4dc96c0cd776f3d965dd2aa0309995d
Reviewed-on: https://code.wireshark.org/review/7981
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-12 16:34:46 +00:00
Gerald Combs fd72024bc2 Move the PortabaleApps packaging up one level.
Update the PA section of the Developer's Guide.

Change-Id: I383d2a2405e742eb353390f5a43fd6d6d32cb25b
Reviewed-on: https://code.wireshark.org/review/8012
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-10 17:16:21 +00:00
Pascal Quantin cacbffe085 PortableApps: ensure that the personal folder is set to the App directory
Otherwise the portable version ends up loading the user local personal profile

Change-Id: Ib670c065319b0dd9673f239ae9459f6ee530f69e
Reviewed-on: https://code.wireshark.org/review/5351
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-17 00:58:34 +00:00
Gerald Combs 4c0fed8522 Don't override the PA package naming convention. Use our full version in
the package name. Set a minimum OS version (Vista). Update some comments.

Change-Id: I28096276d2588993136b008a307dbcc7983496b0
Reviewed-on: https://code.wireshark.org/review/3974
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03 16:21:47 +00:00
Gerald Combs 6b5669d545 Fix dist. Remove unused files.
Change-Id: I44b2dbfa3859841c67e933d8e7c510834b7cc2ee
Reviewed-on: https://code.wireshark.org/review/3967
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03 05:37:19 +00:00
Gerald Combs b03eeeb0aa Fix the PortableApps package name.
Remove Installer.nsi while we're here.

Change-Id: I739d5d825fd76eac9b50d26fab2d44e853dc83f9
Reviewed-on: https://code.wireshark.org/review/3965
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03 01:05:40 +00:00
Gerald Combs d3e116466c PortableApps: Remove invalid makefile commands.
Change-Id: I6ed0f72a6915cd12d7866c978dce0d25c328dffd
Reviewed-on: https://code.wireshark.org/review/3964
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03 00:20:50 +00:00
Gerald Combs 85eec7f603 Fix PortableApps packaging.
Our Windows portable packaging environment has a lot of cruft which is
no longer relevant. We removed support for U3 packages and the method
we use to generate PortableApps packages has been deprecated for a while.

Create PortableApps packages using current file formats (AppInfo v3.0)
and tools. Generate the PA launcher using the PortableApps.com Launcher
generator. Copy files and directories from the top level instead of using
a manifest derived from the NSIS installer.

The manifest is a good idea, but we should create a central manifest
and use that to generate the NSIS and PortableApps packages instead of
trying to parse wireshark.nsi.

The new package still needs a bit of work but it installs and runs in
the current version of the PA Platform.

Remove the define for MAKENSIS_UNICODE. It doesn't look like we were
using it.

Start tearing down makefiles and scripts that we no longer use.

Ping-Bug: 4191
Change-Id: Ib7173eec887d0abf69bb176a1e3f943a5a63bee4
Reviewed-on: https://code.wireshark.org/review/3962
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02 23:55:54 +00:00
Gerald Combs b7fb1167e3 Qt → wireshark. GTK+ → wireshark-gtk.
Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".

It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.

Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).

Tested:

- Nmake builds

- NSIS packaging

- CMake builds (Windows, OS X)

- Autotools build and distcheck

- RPM packaging

To do:

- Test Debian packaging

- Fix PortableApps

Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02 15:39:17 +00:00
Pascal Quantin 9ce04cbb09 Fix download of 3rd party packages when WIRESHARK_TARGET_PLATFORM environment variable is not explicitly set
Bug: 10317
Change-Id: Ic7b4ffe2bbe4f69928b91a5151d8cef1ae59f723
Reviewed-on: https://code.wireshark.org/review/3203
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-28 18:32:24 +00:00
Joerg Mayer 494092a418 One more place with win32-setup.sh -> win-setup.sh
Change-Id: Id6738d06470da81dd18d0e80e474c9ca64169d03
Reviewed-on: https://code.wireshark.org/review/3145
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-21 01:10:25 +00:00
Bill Meier a42b04eade Remove 'include win32.mak' from certain nmake files when not needed.
Change-Id: I05a505d884abb5fd7fca87bb89af29e3e4502b74
Reviewed-on: https://code.wireshark.org/review/1460
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-01 15:12:46 +00:00
Alexis La Goutte 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
Alexis La Goutte 94a791a76e Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$)

Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688
Reviewed-on: https://code.wireshark.org/review/876
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-31 16:00:04 +00:00
Alexis La Goutte 6c66f368df Fix indent (use 4 spaces) and add modelines and remove trailing whitespace
svn path=/trunk/; revision=54611
2014-01-05 18:39:58 +00:00
Alexis La Goutte 9e49bf897d Fix build when use PortablesAPPS
svn path=/trunk/; revision=54607
2014-01-05 18:16:29 +00:00
Jörg Mayer 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
Gerald Combs f954245491 Revert some inadvertent changes from the last commit.
svn path=/trunk/; revision=53329
2013-11-14 22:52:05 +00:00
Gerald Combs 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
Gerald Combs ba49d9bcf0 Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,
the PortableApps version relies on U3_-prefixed environment variables.

svn path=/trunk/; revision=52941
2013-10-29 04:05:27 +00:00
Gerald Combs 66558ef5a8 Remove some (but not all) U3 remnants.
svn path=/trunk/; revision=52935
2013-10-28 22:11:51 +00:00
Gerald Combs 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
Alexis La Goutte 256d290491 Try 2 to fix Portable App buildbot
svn path=/trunk/; revision=51595
2013-08-30 11:47:58 +00:00
Alexis La Goutte 84f2e7d221 Try to fix Portable App buildbot
svn path=/trunk/; revision=51594
2013-08-30 11:18:06 +00:00
Chris Maynard ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Gerald Combs 035d5b231e Use a larger LZMA dictionary.
svn path=/trunk/; revision=48328
2013-03-15 21:46:25 +00:00
Alexis La Goutte 7dcc02efac Fix Build of PortableAPPs with Qtshark
svn path=/trunk/; revision=47833
2013-02-23 09:58:46 +00:00
Alexis La Goutte c4851a88ac Add QtShark stuff to PortableApps
svn path=/trunk/; revision=47825
2013-02-22 16:51:43 +00:00
Gerald Combs b5e5d6ac35 Don't add uninstall.exe to the U3/PortableApps manifest. Define
STAGING_DIR. Update some makefile dependencies.

svn path=/trunk/; revision=43244
2012-06-13 22:28:28 +00:00
Gerald Combs 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
Gerald Combs 79a0fbdca0 Make the U3 and PortableApps "clean" and "distclean" targets more
consistent with the NSIS targets.

svn path=/trunk/; revision=37649
2011-06-10 17:25:55 +00:00
Gerald Combs b83634d5a9 Cygwin 1.7 is much pickier about paths. Pass a POSIX path to bash.
svn path=/trunk/; revision=35930
2011-02-12 17:54:36 +00:00
Bill Meier 917a367ba0 makefile.nmake => Makefile.nmake
svn path=/trunk/; revision=35750
2011-02-02 02:52:53 +00:00
Chris Maynard b808a5f5e6 Revert back to NSIS from NSIS Unicode to resolve bug 5558.
svn path=/trunk/; revision=35455
2011-01-10 16:27:09 +00:00
Chris Maynard 252861e6af Updates for Wireshark portable installer. Using nsis unicode now.
svn path=/trunk/; revision=35300
2010-12-29 20:41:53 +00:00
Chris Maynard 1b38a8f876 Allow more than one instance of Wireshark to be started. For now, the stuff
that disallowed it is just commented out.  Later, we might choose to make use
of AllowMultipleInstances like other portableapps do, such as Firefox, et al.
This change was made as a result of the following query on the -users list:

    http://www.wireshark.org/lists/wireshark-users/201012/msg00008.html

svn path=/trunk/; revision=35104
2010-12-02 20:05:19 +00:00
Chris Maynard 61d26e2c7b Use Wireshark installer icon for portable apps installer. Fixes bug 4374.
svn path=/trunk/; revision=34687
2010-10-29 15:57:47 +00:00
Gerald Combs 4f5057e218 Add !ENDIF if needed.
svn path=/trunk/; revision=33880
2010-08-22 00:41:06 +00:00
Gerald Combs 64fce08dc7 Fix the U3 and PortableApps builds.
svn path=/trunk/; revision=32441
2010-04-09 23:51:22 +00:00
Bill Meier 2b75413d3a Set svn:executable property for some .py and .pl files
svn path=/trunk/; revision=32287
2010-03-25 22:22:45 +00:00
Gerald Combs b3e5d2f39d More fixes from John T. Haller via bug 4158, with some cleanups from me.
svn path=/trunk/; revision=30696
2009-10-25 19:33:36 +00:00
Gerald Combs b1a5c989ee Add updates from bug 4158.
svn path=/trunk/; revision=30681
2009-10-23 21:38:38 +00:00
Kovarththanan Rajaratnam d36637e8f5 Pass on WinPcap/MSVC redistributable executables to the WiresharkPortable launcher and not the extractor.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3547.

svn path=/trunk/; revision=29335
2009-08-08 09:22:58 +00:00
Graeme Lunt a539aa732c Changes to address bug 3547:
1) Make sure WiresharkPortable.nsi uses correct WinPcap version (from config.nmake), and also vcredist.
2) Automatically generate WiresharkPortable.ini with correct default values
3) Include readme.txt in the distribution so that users know how to use WiresharkPortable.ini

Thanks to Kovarththanan Rajaratnam for basic patch.


svn path=/trunk/; revision=28880
2009-06-29 13:01:54 +00:00
Graeme Lunt b96499fb63 Update for the latest WinPcap and also installation of the VC redistributable.
svn path=/trunk/; revision=28717
2009-06-13 08:20:46 +00:00
Gerald Combs dfef2ab632 When copying and renaming files, put quotes around the sources and
destinations.

svn path=/trunk/; revision=25957
2008-08-08 17:15:34 +00:00