aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
AgeCommit message (Collapse)AuthorFilesLines
2014-12-101.99.1 → 1.99.2.Gerald Combs1-1/+1
Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98 Reviewed-on: https://code.wireshark.org/review/5705 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-13Add Kerberos 3.2.2 package for Win64Pascal Quantin1-2/+12
Change-Id: If02469aa1a01972d2032478dce3bf872802f37cb Reviewed-on: https://code.wireshark.org/review/4661 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13Upgrade Win64 GTK2 package to 2.24.23-3.39Pascal Quantin1-6/+5
Change-Id: I0f5f27aa2fc13f38af73a42e1c6e4a36636d2fc7 Reviewed-on: https://code.wireshark.org/review/4656 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-071.99.0 → 1.99.1.Gerald Combs1-1/+1
Change-Id: I8580be0bfe88e33df333f0397f51762f4af819f6 Reviewed-on: https://code.wireshark.org/review/4532 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02Upgrade GnuTLS 3.2.15 / Gcrypt 1.6.2 packagePascal Quantin1-4/+4
We bundle a recompiled libcrypt library without AES-NI support so as to workaround a memory corruption seen when configuring AES keys Bug: 10476 Change-Id: I7735343530ec90b7b67ece4c6eb5b4bf1ddb857e Reviewed-on: https://code.wireshark.org/review/4401 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>
2014-09-29GTK+: Revert back to 2.24.14-1.1 on Win64.Gerald Combs1-5/+5
As Pascal discovered in https://www.wireshark.org/lists/wireshark-dev/201409/msg00045.html Wireshark-gtk.exe crashes at startup on Windows 8.1 x64 when compiled with the GTK+ 2.24.23-1.1 bundle and Visual C++ 2013. Revert to the Win64 build to the prior GTK+ bundle, which works on my test system. Update the release notes. Make sure we use a libintl-8.dll that's compatible with GnuTLS. Ideally we'd just upgrade or rebuild the GTK+ bundle but so far that hasn't worked. Prior to this I tried: Updating the gtk2 package at build.opensuse.org to 2.24.24. This fails with [ 187s] make[3]: Leaving directory `/home/abuild/rpmbuild/BUILD/gtk+-2.24.24/gtk' [ 187s] /usr/bin/gtk-update-icon-cache --force --ignore-theme-index \ [ 187s] --include-image-data \ [ 187s] --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ [ 187s] mv gtkbuiltincache.h.tmp gtkbuiltincache.h [ 187s] gtk-update-icon-cache: No theme index file. [ 187s] make[2]: *** [gtkbuiltincache.h] Error 1 Switching to the OBS GTK+ 3.14 package. It looks like a lot of our GTK+ code is deprecated, including GtkAction and GtkAttachOptions. Change-Id: I1548c84022f02895e5d424cd61e0fed7b57b2e75 Ping-Bug: 9914 Reviewed-on: https://code.wireshark.org/review/4379 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02Fix PortableApps packaging.Gerald Combs1-8/+14
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-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-0/+1
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-08-25Updates for docbook builds on WindowsGraham Bloice1-0/+10
In config.nmake search for multiple versions of fop in a couple of places, preferring fop 1.1 In Makefile.nmake remove any PYTHONPATH env var (as that's probably for Windows) and not the Cygwin python used in asciidoc In Readme.txt update some Cygwin package info Change-Id: I117ec6bbdabc34829b421fd514508383b925090f Reviewed-on: https://code.wireshark.org/review/3816 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-20In Visual Studio builds, enable the L4 warningGraham Bloice1-1/+2
4189: Local variable is initialized but not referenced Fix some variables found by this Change-Id: Icc13def5413f1fe885ec25e659462c8906a6cfa0 Reviewed-on: https://code.wireshark.org/review/3748 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-15Windows: Fix PowerShell 2.0 compatibility.Gerald Combs1-0/+3
PowerShell 2.0's Get-ChildItem doesn't support "-File" even though http://technet.microsoft.com/en-us/library/hh847897.aspx says otherwise. Add a config.nmake option to test PS 2.0 compatibility. Change-Id: I8de83cd0841d4ab0b01351c2d39084578a2c84ee Reviewed-on: https://code.wireshark.org/review/3625 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-14Windows: Clean up text file packaging.Gerald Combs1-3/+4
Convert textify.sh to PowerShell. Use PowerShell's built-in line ending conversion so that we don't depend on unix2dos. Only copy the help toc and text files to the staging directory. Add PowerShell to the Developer's Guide. Fixup some other content. (asn1/Makefile.inc.nmake contains a call to u2d. Hopefully that's not a problem.) Change-Id: I61a92aa54820d01015abb9ffa65815558ae31c71 Reviewed-on: https://code.wireshark.org/review/3487 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
2014-08-08Autodiscover flex and bison in config.nmake.Gerald Combs1-6/+22
Change-Id: I4683d0eeb06e5616103f3e6e25ce7f1549a2bb05 Reviewed-on: https://code.wireshark.org/review/3510 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-08Make Python mandatory to build on WindowsРоман Донченко1-1/+6
While nominally optional, building without it doesn't work, so just make it mandatory. The verify_tools target already passes $(PYTHON) to win-setup.sh --appverify; we just need to supply a default value for PYTHON, so that $(PYTHON) doesn't expand to an empty string. It's also convenient for the developer if Python can be automatically found on the PATH. Change-Id: I4f54695625b74c5b4c758ef1e3bc9ed4467db514 Reviewed-on: https://code.wireshark.org/review/3391 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Tested-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-07Win flex-bison and Chocolatey updates.Gerald Combs1-7/+2
Chocolatey's latest winflexbison package is usable. Update config.nmake, FindLEX.cmake, and FindYACC.cmake accordingly. Rename CHOCOLATEY_INSTALL_PATH to CHOCOLATEY_BIN_PATH since that's what we're finding. Change-Id: I39973fba0531b3f7a1315ca010a8bd70581db3fb Reviewed-on: https://code.wireshark.org/review/3479 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-04Rip out the filetap codeEvan Huus1-5/+0
We decided at sharkfest that this wasn't the right design for file dissection; we have more-or-less settled on way forward, but nobody's shown interest in implementing it. Whether or not that ever happens, this code is effectively dead and should be removed. Change-Id: I14d6086df3204fffb6485228db39d9f407661417 Reviewed-on: https://code.wireshark.org/review/3400 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-28(Trivial) config.nmake: fix a spelling error and add some punctuation.Bill Meier1-1/+1
Change-Id: I326dbae8fe1d3593de00c9e78a124c1221b7314b Reviewed-on: https://code.wireshark.org/review/3231 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-28config.nmake: Do some minor changes (mostly in comments).Bill Meier1-3/+6
- Update comment: /O2 enables /Gs which is "Control Stack Checking Calls" not "Buffer Security Check" - Remove explicit setting of /GS (Buffer Security Check) since it's set by default. (The explicit setting did not apply to the CFLAGS used to compile Wireshark files because the setting was in the wrong place, but, fortunately, /GS is on by default. - Add a comment about /GS being on by default. - Remove some trailing whitespace. Change-Id: I6cf631ee1ba0fb8556171861c7e5eb6d959c8f0c Reviewed-on: https://code.wireshark.org/review/3228 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-28Fix MSVC2013 Lua package (previous one was linked against MSVC2012)Pascal Quantin1-2/+2
Change-Id: I632eea7250e7e60482f62d9ea62ac407fc6506d1 Reviewed-on: https://code.wireshark.org/review/3222 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-27Use a compatible Lua library when building with MSVC2013Pascal Quantin1-4/+8
Change-Id: If462dc45df9dbd418c4de2eb6bb9130a283d863c Reviewed-on: https://code.wireshark.org/review/3211 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-25Make HTML Help steps compliant with newer Nmakes.Gerald Combs1-8/+2
Nmake 12 seems to be more strict about spaces in commands. Add the hhc.exe path to PATH and use a bare command instead. Change-Id: I9fbd9abdabf7f51ac7bac2cbe8d938ae7bb0640e Reviewed-on: https://code.wireshark.org/review/3192 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-25Add the default directores used by the Qt Online Installer for Qt 5.3.Gerald Combs1-0/+4
Change-Id: Ia81ce10318b34f6af68862622a63c64e2883a937 Reviewed-on: https://code.wireshark.org/review/3191 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-21Obsolete tools/winXX-setup.sh:Joerg Mayer1-0/+2
- Move DOWNLOAD_TAG into config.nmake - Call win-setup.sh directly instead of winXX-setup.sh - TODO: Remove tools/winXX-setup.sh files Change-Id: Ie02b6b468b4f3007f5e2b6a8282e2e6cdf7d1a70 Reviewed-on: https://code.wireshark.org/review/3144 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-01Fix the checks for the Cygwin path.Guy Harris1-7/+8
I.e., do if we have 32-bit Cygwin CYGWIN_PATH=path to it else if we have 64-bit Cygwin CYGWIN_PATH=path to it else fail endif rather than CYGWIN_PATH=standard path for 32-bit Cygwin if we don't have 32-bit cygwin and we do have 64-bit Cygwin CYGWIN_PATH=path to 64-bit cygwin else fail endif as the latter will fail if we *do* have 32-bit Cygwin. Change-Id: I42d607a1319263edcc1d6e546b813862b7d33ffa Reviewed-on: https://code.wireshark.org/review/2756 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-01Add logic to config.nmake to find 64-bit cygwin, and a note warningTim Furlong1-0/+9
about forward slashes in the QT5_BASE_PATH if the recommended qmake command is used; both of these issues will cause annoyingly non- obvious errors. Change-Id: I6f9a662969d1fc1887e75e8b0fde3520bbbea416 Reviewed-on: https://code.wireshark.org/review/2749 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-01Fix the QT build on Qt 5.3 or later to use the windeployqt toolGraham Bloice1-4/+2
to copy the rquired Qt files into the runtime directory Qt 5.2 is broken as windeployqt doesn't take the required --release flag Also fix the passing of GCC_DLL and GPGERROR_DLL into config.pri so that the Qt build copies the required files instead of the entire gnutls bin dir twice (the variables expanded to nothing). Add support for autodetection of Qt 5.3.0 with msvc2013 Change-Id: I1e9c70a5ff5d1fdfdce88ba15d324f1899c8129c Reviewed-on: https://code.wireshark.org/review/2734 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-27Have the makefile run windepoyqt if it exists to copy the required dlls to ↵AndersBroman1-1/+4
the install dir. Change-Id: If87c2670e1ffef116d4497241f070fa41a70015b Reviewed-on: https://code.wireshark.org/review/2644 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Get rid of obsolete references to nettlePascal Quantin1-34/+0
Bug: 2089 Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83 Reviewed-on: https://code.wireshark.org/review/2388 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-16More Python-bindings removal.Jeff Morriss1-40/+0
Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce Reviewed-on: https://code.wireshark.org/review/2283 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-06Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin1-5/+13
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-04Use -O2 option when compiling with MSVCPascal Quantin1-3/+6
Change-Id: Ia2c14b782b1a73ecab41c25ed21e4fcf356f5ee3 Reviewed-on: https://code.wireshark.org/review/1948 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04Use the -Ox compiler option. AndersBroman1-1/+9
Change-Id: I5d216d132485f6d2f8c63fa5a10b22e884e26b02 Reviewed-on: https://code.wireshark.org/review/1937 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-231.11.4 → 1.99.0.Gerald Combs1-2/+2
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044 Reviewed-on: https://code.wireshark.org/review/1761 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-16Build with GTK+ 2.24.23.Gerald Combs1-11/+32
Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460 Reviewed-on: https://code.wireshark.org/review/1665 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-05-14Add a comment indicating that 'PLATFORM' is apparently set only for X64.Bill Meier1-1/+2
Change-Id: I5248c421e53a4347789c076433af004697a1b682 Reviewed-on: https://code.wireshark.org/review/1637 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-12Add default paths for the Qt online installer for Windows.Gerald Combs1-0/+7
Change-Id: I55d1ad6e4cc14aa5f02597d2afc8512018181543 Reviewed-on: https://code.wireshark.org/review/1618 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-01Add a comment re VS2013EE requiring that win32.mak needs to be separately ↵Bill Meier1-6/+15
obtained. Change-Id: I53413f7bdde50149fd923bbe35c995145d5139f2 Reviewed-on: https://code.wireshark.org/review/1458 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-04-17Use Lua 5.2.3 linked against MSVCR110.DLL when compiling with MSVC2012Pascal Quantin1-0/+8
Change-Id: I372ca3b6ad80ee5a3073d06bccd3986a6d7ba27f Reviewed-on: https://code.wireshark.org/review/1176 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-151.11.3 → 1.11.4.Gerald Combs1-1/+1
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019 Reviewed-on: https://code.wireshark.org/review/1154 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-09Switch back Windows 32 bits build to GTK2Pascal Quantin1-2/+2
GTK3 does not work great on Windows: - the GUI is quite ugly - features like background color in filter box does not work - x64 builds are still using GTK2 - no one is putting efforts on this to fix those issues As we are transitioning to Qt, I do not expect any improvement soon. Let's switch back to a more user friendly GUI. Change-Id: I04c0856b8ac8ce808c1942f7f26b14dd57388d1a Reviewed-on: https://code.wireshark.org/review/1026 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-07Switch to Lua 5.2.3 built with MSVC2010 instead of the one built with MingW ↵Pascal Quantin1-2/+2
gcc 4.3 Fixes bug 9957 Change-Id: Ibe38ec25be5cfdad98c53c8257b0a858529897f6 Reviewed-on: https://code.wireshark.org/review/991 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-05Upgrade Windows builds to Lua 5.2.3Pascal Quantin1-4/+4
Change-Id: Ie7fffa9d57b1b861ab57cc55259c79cf0e8ee0e0 Reviewed-on: https://code.wireshark.org/review/974 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(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-29Upgrade Windows builds to Lua 5.2.1Pascal Quantin1-5/+5
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-04(Trivial) Fix 2 typos; Reformat some long lines.Bill Meier1-6/+6
Change-Id: If7d009b7764e858bd210d613ac9af219e9e20464 Reviewed-on: https://code.wireshark.org/review/491 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs1-4/+4
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-02Improve windows buildGraham Bloice1-3/+34
Allows config.nmake to pick up settings from environment variables. With the move to git I'm no longer happy with my permanently modified copy of config.nmake, these changes allow the most often modified values to be set from environment variables. As a bonus, some of the variables are set by the vcvarsall.bat for Visual Studio 2012 or later Change-Id: I681aeaec9519f6b6c9fa2c33abc706ce335585f5 Reviewed-on: https://code.wireshark.org/review/70 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-27Make it easier to try GTK 3.6Anders Broman1-2/+6
svn path=/trunk/; revision=54986
2014-01-26Drop support of Visual Studio 2005Alexis La Goutte1-14/+0
* Remove _MSC_VER < 1500 check * Cleanup config.nmake See http://www.wireshark.org/lists/wireshark-dev/201305/msg00159.html svn path=/trunk/; revision=54965
2014-01-16More Chocolatey lex/yacc updates.Gerald Combs1-3/+3
Add Windows-style path handling to runlex.sh. Update the example Chocolatey LEX path accordingly. This lets us use path information in LEX and have it work in both nmake and runlex.sh Add a FindChocolatey.cmake module. Update FindLEX and FindYACC to use it. The code is currently untested and commented out. svn path=/trunk/; revision=54828
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 07:10:05 +0000