Commit Graph

78 Commits

Author SHA1 Message Date
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
Ulf Lamping 22045b4a54 lot's of GTK1 related code cleanup in the Win32 build process
svn path=/trunk/; revision=24854
2008-04-09 03:48:16 +00:00
Gerald Combs 12ac5d6859 Start the process of removing GTK1.
svn path=/trunk/; revision=24770
2008-04-04 18:18:18 +00:00
Stig Bjørlykke bd24ad1cbe Added $(GTK2_LIB_DIR)\loaders to some makefiles in an attempt to fix the
u3 and portableapp build.

svn path=/trunk/; revision=24369
2008-02-17 10:37:21 +00:00
Gerald Combs 56ae79a3fd Unpack FindProcDLL.dll into $(WIRESHARK_LIBS\nsis-plugins, and tell NSIS
where it is using "!addplugindir".

svn path=/trunk/; revision=24166
2008-01-23 01:23:06 +00:00
Jörg Mayer c0dc930689 Graeme Lunt:
(The fix is to cd back to "../portableapps/win32", rather than
"../u3/win32", at the end of the nsis-bits target in makefile.nmake.)

Me:

Get rid of some whitespace at the end of lines.

svn path=/trunk/; revision=24031
2008-01-08 08:07:45 +00:00
Graeme Lunt 039ad15bbf UPX compression corrupts the WinPcap installer - so don't UPX it.
svn path=/trunk/; revision=24014
2008-01-04 15:28:44 +00:00
Graeme Lunt 105c394521 Update to use the generic manifest and make independent of the U3 packaging.
Also tidy up.


svn path=/trunk/; revision=24013
2008-01-04 14:12:22 +00:00
Graeme Lunt d8519d3c17 Automatically install the FindProcDll.dll NSIS plug-in required for the WiresharkPortable.exe.
This should allow the builbot to build the PortableApps packaging.


svn path=/trunk/; revision=23881
2007-12-16 08:36:16 +00:00
Graeme Lunt 04b798cbf4 Update to optionally use the "Ultimate Packer for eXecutables" (UPX) to pack the exes and dlls prior to U3 and PortableApps packaging.
For the U3 package, this results in a 40% smaller package.
For the PortableApps version, the package size is not much different, but the install time is quicker. 


svn path=/trunk/; revision=23484
2007-11-18 10:20:26 +00:00
Ulf Lamping 634b43c3f9 update various other places, where WinPcap version 4.0.1 was used
svn path=/trunk/; revision=23431
2007-11-12 07:31:38 +00:00
Graeme Lunt 2314eec9cb A bit of a readme for the Wireshark Portable packaging. Includes details of the NSIS plug-in required.
svn path=/trunk/; revision=23350
2007-11-03 20:27:48 +00:00
Ulf Lamping 90935b972e at least mention in a comment, that you'll need the FindProcDLL plug-in
svn path=/trunk/; revision=23349
2007-11-03 08:48:12 +00:00
Graeme Lunt cea89f8c12 Initial Portable Apps (www.portableapps.com) packaging to produce a "Wireshark Portable" (WSP) distribution.
This allows Wireshark to be run from any USB stick, unlike the U3 packaging which must be installed on a specific U3 device.

The packaging basically builds upon the U3 distribution so new libraries/config only need to be added to the U3 makefile to update both distributions.

It still takes a "dumb" approach to WinPcap - installing it if it is not already installed and removing it (if WSP installed it) when Wireshark quits. (This is worse than the U3 packaging which only uninstalls WinPcap when the device is removed.) Really must talk to the WinPcap guys to see how we can make this less intrusive.

I am talking to John Haller (the Portable Apps guy) about fine tuning the distribution. 


svn path=/trunk/; revision=23340
2007-11-02 13:47:23 +00:00