aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
AgeCommit message (Collapse)AuthorFilesLines
2015-07-241.99.8 → 1.99.9.Gerald Combs1-1/+1
Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552 Reviewed-on: https://code.wireshark.org/review/9780 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-181.99.7 → 1.99.8Gerald Combs1-1/+1
Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17 Reviewed-on: https://code.wireshark.org/review/8979 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-31Fix zlib cmakeGraham Bloice1-4/+4
Add support for the locally modified version of zlib to suppress a CMake warning and disable building of the zlib examples. Change-Id: I9ae08b49d149951e8626d506f69f1757a1ec7e23 Reviewed-on: https://code.wireshark.org/review/8706 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-05-281.99.6 → 1.99.7.Gerald Combs1-1/+1
Change-Id: I8c431f162d199c8507ba57d84e496dce5f5a0933 Reviewed-on: https://code.wireshark.org/review/8677 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-06Use zlib 1.2.8 on Windows.Gerald Combs1-6/+5
Change-Id: I3df88b1e891f43cd6b6ed089f6c3d20a942e68bc Reviewed-on: https://code.wireshark.org/review/7952 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-03Nmake preprocessor string comparisons are case-sensitive.Gerald Combs1-2/+2
In related news, VC/bin/amd64/vcvars64.bat calls "set Platform=X64" while VC/bin/x86_amd64/vcvarsx86_amd64.bat calls "set Platform=x64". Change-Id: I4bc97eee6170c11e43ed2b46b7599f5021843d6a Reviewed-on: https://code.wireshark.org/review/7893 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-25Always use html2text.py for FAQ, improve outputPeter Wu1-13/+1
A recent commit broke compilation with Python 3. The original author of html2text.py is deceased and the fork has increased the number of files for this "simple" helper. The html2text.py script in this patch was rewritten and its output matches with lynx (except for a few newlines around lists). This means that indentation has been added for headings, paragraphs and lists. Also, since it was written from scratch, a new license could be chosen that matches Wireshark. Since now the in-tree html2text.py script provides nicer output, remove detection of the alternative programs (elinks, links). lynx/w3m is somehow still necessary for asciidoc though. (I also looked into reusing html2text.py for the release notes to replace asciidoc, but the --format=html output produces different output (HTML adds a ToC and section numbers). For now still require lynx for release notes) Tested with Python 2.6.6, 2.7.9, 3.2.6 and 3.4.3 under LC_ALL=C and LC_ALL=en_US.UTF-8 on Linux. Tested reading from stdin and file, writing to file, pipe and tty. Tested with cmake (Ninja) and autotools on Arch Linux x86_64. Test: # For each $PATH per python version, execute (with varying LC_ALL) help/faq.py -b | tools/html2text.py /dev/stdin | md5sum help/faq.py -b | tools/html2text.py | md5sum help/faq.py -b | tools/html2text.py help/faq.py -b | tools/html2text.py >/dev/null Change-Id: I6409450a3e6c8b010ca082251f9db7358b0cc2fd Reviewed-on: https://code.wireshark.org/review/7779 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-201.99.5 → 1.99.6.Gerald Combs1-1/+1
Change-Id: Iff642606bdb9858dc54b90abe02bf1572f44fc25 Reviewed-on: https://code.wireshark.org/review/7766 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-191.99.4 → 1.99.5.Gerald Combs1-1/+1
Change-Id: Ifa1a57ac2db5d921d9b53dbe997cfa1916720c26 Reviewed-on: https://code.wireshark.org/review/7759 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-10Change a lot of http:// URLs to https://.Gerald Combs1-2/+2
Most of our sites are now HTTPS-only. Update URLs accordingly. Update other URLs while we're at it. Remove or comment out dead links. Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33 Reviewed-on: https://code.wireshark.org/review/7621 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-051.99.3 → 1.99.4.Gerald Combs1-1/+1
Change-Id: I96953b6ca34140972a783c3066614399981ca1e2 Reviewed-on: https://code.wireshark.org/review/7549 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-27Use VCINSTALLDIR environment variable in order to locate MSVCR_DLL.Dmitry Bazhenov1-5/+6
This fixes Windows build in cases when MSVS is installed in non-default directory. Change-Id: I9cfa3f728d64e9d5952c68b2b2b70e627d3f5c3e Reviewed-on: https://code.wireshark.org/review/7426 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-02-19Remove quotes from an Nmake macro.Gerald Combs1-1/+1
Change-Id: Ibe6a544af49c39c12ce13264fb010ccdc54d471b Reviewed-on: https://code.wireshark.org/review/7267 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-19Qt: Add more version and packaging information to the main window.Gerald Combs1-0/+7
Add a "flavor" (for lack of a better word) banner, which can be set at build time via WIRESHARK_VERSION_FLAVOR / VERSION_FLAVOR. Set it to "Development Build" by default. This effectively migrates the "DEVELOPMENT VERSION" logo image text from the GTK+ UI. Add full release and automatic update information at the bottom. Remove the short version from the welcome banner (top left). To do: - Add back support for gui_version_placement. - Move the version and repository branch to the flavor label? - Add update links as appropriate to the bottom. - Clean up layout and spacing. Change-Id: I28af33e6c2beb855f803a2dfedef49f3e8389057 Reviewed-on: https://code.wireshark.org/review/7071 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-12nmake: Allow Cygwin path to be providedRoland Knall1-1/+3
I have installed cygwin at a different location then the default location. Therefore the nmake steps tend to fail, and I will have to adapt the config.nmake script every time. This patch allows the CYGWIN_PATH variable to be set outside the build-script Change-Id: Iaecdd2aa72a0529574fab7e6aeae18fbfd621721 Reviewed-on: https://code.wireshark.org/review/7078 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-041.99.2 → 1.99.3.Gerald Combs1-1/+1
Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638 Reviewed-on: https://code.wireshark.org/review/6956 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-30NMake: Add Chocolatey paths.Gerald Combs1-1/+7
Change-Id: I8ea53475a64052e945709a1f5878aa23eee65c74 Reviewed-on: https://code.wireshark.org/review/6859 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-25Replace "GIT" with "VCS" in make-version.pl and files it manipulates.Guy Harris1-3/+3
That makes it more VCS-neutral - apparently some people maintain private versions under VCSes other than Git, and make-version.pl still handles those VCSes. Change-Id: Ie4914b16fea8ce800582729260c5e9b9cf1111f4 Reviewed-on: https://code.wireshark.org/review/6779 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19On my system NSIS installs in the path defined in environment variableAndersBroman1-0/+2
ProgramFiles(x86)=C:\Program Files (x86) Add that to the locations where we look for it. I couldn't use ProgramFiles(x86) as a constant so put the path verbatim. Change-Id: Ibad9d4e2544e5b3924e10c68f02e072b0012226f Reviewed-on: https://code.wireshark.org/review/6651 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-07MSVC: Fix opting out of librariesOrgad Shaneh1-16/+0
When *_DIR variables are defined (even if empty), nmake tries to build them and fails. Don't set them at all if not configured to. Change-Id: I3825c16f26e45a1a3fc489633084a074838f8c34 Reviewed-on: https://code.wireshark.org/review/6365 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-12-29Windows build improvements:Graham Bloice1-19/+9
Added /Zo flag for VS2013 builds to add more debugging info Removed obsolete comment on unused /GS flag and obsolete /FR flag. Removed '#ifdef WIRESHARK_GENERATE_BSC_FILE' and related (which specified the obsolete /FR flag). Added /RELEASE flag to linker to set checksum in PE header Fixed an old typo. CMake added /INCREMENTAL:NO flag to linker to overide default and prevent warning messages. Change-Id: I039b884657d2886acc273dc6dd099d07a7b8ec7d Reviewed-on: https://code.wireshark.org/review/6110 Reviewed-by: Bill Meier <wmeier@newsguy.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 15:43:11 +0000