Commit Graph

71 Commits

Author SHA1 Message Date
Gerald Combs 98080036b6 Capitalize "Wireshark" in various package names.
svn path=/trunk/; revision=41621
2012-03-16 17:36:40 +00:00
Bill Meier 605dea0486 CVARSDLL hasn't been used (is undefined) for a while....
svn path=/trunk/; revision=41180
2012-02-24 16:23:38 +00:00
Gerald Combs 5520a452b5 The MSDN page for ZeroMemory recommends using SecureZeroMemory instead,
so do so. Add ZeroMemory to checkAPIs.pl.

svn path=/trunk/; revision=38584
2011-08-17 16:54:24 +00:00
Gerald Combs 17351102dd Add some distclean / clean targets.
svn path=/trunk/; revision=38457
2011-08-10 20:02:31 +00:00
Chris Maynard 716766aa27 Add a cast to avoid "conversion from size_t to int, possible loss of data" warning found when attempting to create the U3 package on Windows 7-x64. Hmm, why doesn't the Window 7-x64 buildbot build U3 or portableapps packages?
svn path=/trunk/; revision=38237
2011-07-28 12:28:06 +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 303539c005 More manifest fixes.
svn path=/trunk/; revision=36482
2011-04-05 22:33:37 +00:00
Gerald Combs 977ccf7f9b Remove the manifest as a prerequisite for packaging.
svn path=/trunk/; revision=36476
2011-04-05 16:14:19 +00:00
Gerald Combs 89de0e74a0 Don't build a manifest if we don't need one.
svn path=/trunk/; revision=36448
2011-04-04 15:41:07 +00:00
Bill Meier 917a367ba0 makefile.nmake => Makefile.nmake
svn path=/trunk/; revision=35750
2011-02-02 02:52:53 +00:00
Bill Meier 81a35645ef Use $(WARNINGS_ARE_ERRORS) (defined in config.nmake) iso -WX
svn path=/trunk/; revision=35748
2011-02-02 02:10:24 +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 8fc1491a60 Switch to using a bundled version of the openSUSE Build Service packages
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.

svn path=/trunk/; revision=31341
2009-12-21 21:06:01 +00:00
Kovarththanan Rajaratnam 66afe84075 Use <gcrypt.h> instead of 'gcrypt.h'
svn path=/trunk/; revision=29501
2009-08-21 20:40:49 +00:00
Graeme Lunt bb14641726 Update to install latest WinPcap and silently install/uninstall the Visual C++ 2008 Redistributable.
svn path=/trunk/; revision=28594
2009-06-02 11:56:28 +00:00
Ulf Lamping b0ceb7cf93 fix the buildbot: linking u3util.exe won't create a manifest file, so don't try to include it
svn path=/trunk/; revision=27368
2009-02-04 21:31:34 +00:00
Ulf Lamping 043532d63e add missing mt.exe calls, to include manifest files into exe / dll files
svn path=/trunk/; revision=27357
2009-02-02 23:09:36 +00:00
Gerald Combs ba485a4163 Add /D_BIND_TO_CURRENT_CRT_VERSION=1 to LOCAL_CFLAGS in modern versions
of Visual C++. (How did this "feature" ever see the light of day?) Make
sure we use LOCAL_CFLAGS *everywhere*. This should fix problems with
building a usable installer under Visual Studio 2008 SP1.

Add comments with links to Visual C++'s idiotic handling of assemblies
and deployment using xcopy. Move to c-ares 1.5.3. Make sure we remove
all of our manifests in epan and packaging/u3/tools.

svn path=/trunk/; revision=26219
2008-09-16 21:08:18 +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
Stig Bjørlykke c785bbf558 Removed even more C++ style comments.
svn path=/trunk/; revision=24186
2008-01-24 22:33:49 +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 b6dc767069 Changes to use a generic manifest to determine package contents, and also U3 self-certification fixes e.g.
* package size (dependent on use of UPX)
* upgrade 
* shortDescription
* vendor


svn path=/trunk/; revision=24012
2008-01-04 14:10:57 +00:00
Graeme Lunt a189f34b84 Fixes to:
a) Check that UPX is configured correctly and offer solutions;
b) Ignore any errors generated from UPX (e.g. from previously compressed files); and
c) Clean up the tools directory when cleaning the U3 distribtion


svn path=/trunk/; revision=23622
2007-11-27 18:07:00 +00:00
Ulf Lamping 07ad3cce07 don't install the *.exe.manifest and *.dll.manifest files. The manifest is embedded in the exe/dll files, so no need to install them seperately.
svn path=/trunk/; revision=23544
2007-11-22 09:04:32 +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 31f090e495 update various other places, where WinPcap version 4.0.1 was used
svn path=/trunk/; revision=23433
2007-11-12 07:34:32 +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
Bill Meier 8519153567 Small fixes:
1. wireshark.bat: Quote %U3_HOST_EXEC_PATH%\wireshark.exe so pathname
   with spaces will work;
2. makefile.nmake: Use $(MAKE) /$(MAKEFLAGS) so things like 
   invoking nmake at the top level with /E to have environment 
   variables override config.namke definitions will work.

svn path=/trunk/; revision=23297
2007-10-28 18:12:52 +00:00
Graeme Lunt 23ce3f94a2 U3 package update to:
a) include smi.dll if SMI_DIR is set
b) add a batch script to run the U3 wireshark configuration by simulating the U3 environment
c) include a test step in the build process to verify that the U3 package contains all the required files (tries to run "wireshark -D")
d) include the wireshark.bat in the U3 zip file.

This final step means that the U3 package can be unzipped on any drive and run using the wireshark.bat script. (Note this currently creates an unwanted cmd window.) 


svn path=/trunk/; revision=23295
2007-10-28 11:58:16 +00:00
Anders Broman 3c419f798c Make MGCP a builtin dissector to reduce the number of plugins.
(Leave the MGCP plugin dir for now).

svn path=/trunk/; revision=23190
2007-10-15 18:57:10 +00:00
Martin Mathieson bafcd03634 In source tree, move wimaxasncp TLV files from plugin folder -> new top-level wimaxasncp folder.
svn path=/trunk/; revision=23184
2007-10-15 12:32:19 +00:00
Anders Broman 1ab1d61168 From Martin Mathieson:
Hopefully the u3 build will then be able to run to completion.

svn path=/trunk/; revision=23178
2007-10-14 22:05:52 +00:00
Anders Broman e045016645 And U3 ...
svn path=/trunk/; revision=23176
2007-10-14 18:34:22 +00:00
Martin Mathieson 2cc36d7876 Also add wimaxasncp TLV desription files to U3 build.
svn path=/trunk/; revision=23159
2007-10-12 11:13:59 +00:00
Anders Broman 4330218b15 Try to fix the U3 build.
svn path=/trunk/; revision=22988
2007-09-26 19:00:48 +00:00
Gerald Combs a6d76c62a5 Clear out any remaining references to the h223 plugin. Replace the
references to h223 in README.plugins with agentx since it's small and
no one seems to be in a hurry to move it to epan/dissectors. 

svn path=/trunk/; revision=22641
2007-08-24 16:08:31 +00:00
Guy Harris da5a4dac33 Add the UNISTIM plugin, and put the plugins in alphabetical order (to
simplify checking whether we have the full list).

svn path=/trunk/; revision=22565
2007-08-21 18:04:09 +00:00
Ulf Lamping bd402b4d16 fix a typo
svn path=/trunk/; revision=22489
2007-08-12 23:38:09 +00:00
Ulf Lamping 0a4e09493a add IANA port-numbers file as a file named "services", with some minor explanations from me at the top of that file
add it to the distributed files, to the Win32 NSIS and U3 packages. UNIX packages will still miss this (optional) file.

svn path=/trunk/; revision=22487
2007-08-12 20:54:30 +00:00
Graeme Lunt 4ec27a3f42 Further synchronisation with wireshark.nsi
svn path=/trunk/; revision=22317
2007-07-15 10:59:07 +00:00
Graeme Lunt bba7d780e9 Include latest configuration files and remove ones no longer shipped.
(Without these configuration files defragmentation was failing - unsure why!)


svn path=/trunk/; revision=22316
2007-07-15 10:26:55 +00:00
Gerald Combs 4155fb0433 Switch to WinPcap 4.0.1.
svn path=/trunk/; revision=22237
2007-07-04 00:53:03 +00:00
Gerald Combs a491fec183 From Mike Harvey: Support for WiMAX and the WiMAX M2M encapsulation protocol.
Add support for WiMAX and M2M to various makefiles and installer files.  Add
basic support for M2M to randpkt.

svn path=/trunk/; revision=21945
2007-05-25 23:40:42 +00:00
Graeme Lunt 9efc4469dd New U3 packaging tool to generate a UUID based on the Wireshark version string within the Wireshark namespace. The Wireshark namespace UUID is:
94630be0-e031-11db-974d-0002a5d5c51b

It is based upon the example code from RFC4122 and links against gcrypt.

Using this tool allows the U3 packaging UUID to be automatically changed for new versions as well as giving each buildbot version a different UUID. 


svn path=/trunk/; revision=21694
2007-05-06 08:15:17 +00:00
Graham Bloice e3f4f4ecb0 Improved cleanup of build artifacts
svn path=/trunk/; revision=21249
2007-03-28 16:32:47 +00:00
Jeff Morriss 9fe056a3d7 Remove references to the megaco plugin from the Windows U3 packaging stuff (hopefully this is the last onegrep megaco *).
svn path=/trunk/; revision=21203
2007-03-26 06:04:17 +00:00