object files from all the source files in the ui directory (but not in
its subdirectories), and link the programs that need it with them.
This cleans things up a little bit, and may also fix the Windows build.
svn path=/trunk/; revision=41061
If 'MANIFEST_INFO_REQUIRED' not defined in config.nmake, don't do 'mt ...' for Wireshark Qt;
Add '*.pdb' to QMAKE_CLEAN;
Fix 'Unescaped backslashes are deprecated' qmake warnings;
Remove "debug" message() statements from QtShark.pro.
svn path=/trunk/; revision=40797
1. Compile and link with (almost exactly) the same options as used
when building Windows Wireshark Gtk.
The options used allow debugging of the exe using Visual Studio exactly
as is done for Wireshark Gtk.
Essentially: configure the "release" version to compile and link with
symbols. (See ui\qt\QtShark for the details).
2. Update QtShark.pro to create a Makefile only for 1 version of Wireshark Qt
which is linked against the "release" Qt libraries.
(IOW: don't create a "debug" Makefile).
3. Remove unused variable assignments from config.pri.
(They can be added back if needed in the future).
svn path=/trunk/; revision=40768
more hard-coded definitions from QtShark.pro. Quote an error message to
fix a Qt Creator complaint.
Add ui\qt\config.pri to the top-level "all" nmake target.
Update README.qt.
svn path=/trunk/; revision=40607
WIRESHARK_RUN_FROM_BUILD_DIRECTORY in your run environment.
On Windows, generate a QMake include file (config.pri) from config.nmake.
svn path=/trunk/; revision=40600
With Subversion 1.7, the working copy metada storage as changed (see
http://subversion.apache.org/docs/release-notes/1.7.html#wc-ng for details).
As a consequence, the file .svn/entries is no more updated and under Windows
the svnversion.h is no more regenerated (unless explicitely removed).
The attached patch fixes this issue so as to also check the .svn/wc.db file
date in the makefile rule.
Note that wc.db file must be checked before entries file as an upgrade of an
existing repository from subversion 1.6 to 1.7 leave an old entries file around
(that is no more updated).
In Makefile.am file, the svnversion.h file generation seems to be
systematically forced. So I guess Linux/Mac boxes are not impacted.
svn path=/trunk/; revision=39910
Makefile.nmake.
Have "clean", "distclean", and "maintainer-clean" in the top-level
Makefile.nmake file clean out the docbook directory.
Add a "docbook" target to the top-level Makefile.nmake file.
svn path=/trunk/; revision=38468
My attachment adds a link to a XSLT file to the preamble of the PDML.
The XSLT will transform the PDML to a HTML page, and the HTML page
features a look similar to Wireshark. See
http://cubic.org/~doj/ebay/a.pdml for an example.
The patch also contains a small perl program which converts the
Wireshark colortable into javascript code which is used in the XSLT
file. If you want to use a different color scheme you would execute the
perl program and insert the generated javascript function into your XSLT
file.
To view the HTML you could either place the PDML and XSLT file on your
webserver and verify that your webserver sends the PDML file as
"text/xml". Then your webbrowser will find the linked XSLT file,
download that as well and convert the PDML to HTML on the fly.
You could also use an XSLT processor like xsltproc to convert the PDML
and XSLT into a static HTML file.
From me:
Minor fixups.
svn path=/trunk/; revision=37298
http://www.apachehaus.com/forum/index.php?action=printpage;topic=143.0
First problem: ZLIB build must be fixed for x64, otherwise there will be one unresolved external symbol later. Quick fix is to open build\win32\build_zlib.bat and insert this at line 51:
set ASM_OPTS=AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"
(info found in zlib\win32\Makefile.msc) and then open zlib\contrib\masmx64\inffas8664.c and prepend "../../" to four includes at the beginning.
svn path=/trunk/; revision=36616
zlib for GTK hasd this comment:
/* LFS conventions have no meaning on Windows. Looking for feature
* macros like _LARGEFILE64_SOURCE or _FILE_OFFSET_BITS on Windows is
* wrong. So make sure any such macros misguidedly defined by the
* user have no effect. Windows has large file support, but the
* official zlib DLL has not been built to provide the 64-bit offset
* APIs, sigh. So we have just patched out the 64-bit offset API
* from this header file.
*/
svn path=/trunk/; revision=36586
spaces, it needs to be quoted, the fact that, if the argument to a cd
command typed at cmd.exe contains spaces, it *doesn't* need to be quoted
nonwithstanding.
svn path=/trunk/; revision=35987
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
(This allows disabling "Warnings as Errors" by just changing config.nmake)
c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
-DWIN32 and -DNULL=0 do not appear to be needed (any more);
-D_MT and _D_DLL are not needed since /MP causes these definitions.
d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...
svn path=/trunk/; revision=35747
(Treat warnings as errors);
Done by simplifing the dependency line for the objects so that the
default .c.obj inference rule is used.
svn path=/trunk/; revision=35564
Followup to 34081: move libwsutil _all_ the way forward so that our inet_pton
is always linked in before wsock32's. This means that our Windows-7 Win64
builds (on which there is a native inet_pton in wsock32) will still work on
pre-Vista Win64's.
svn path=/trunk/; revision=34093
with the Lua or libgnutls flags, as nothing in the top-level directory
should use them directly.
However, libwireshark *does* require the Lua flags, so use them.
svn path=/trunk/; revision=33534
Sébastien's initial commit [1] didn't contain support for embedding Python on
Windows.
[1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529
From me:
Comment out PYTHON_EMBED for now.
Start a list of known Python+CRT versions.
Add get_wspython_dir to libwireshark.def.
svn path=/trunk/; revision=33036
Add tools/textify.sh, which makes a Notepad-clickable copy of a text
file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt.
Remove tools/unix2dos.pl and use Cygwin's u2d instead.
svn path=/trunk/; revision=32440
(But it built on the Win64 buildbot; did Microsoft add it in later
releases? If so, should we include it only if it's needed?)
svn path=/trunk/; revision=32107
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
The attached patch force 'svn info' command output as english to enable
detection of svn revision, whatever language is configured in Windows.
svn path=/trunk/; revision=31245
pipes. Enable this by default on Windows. Remove code that tried to
use WaitForSingleObject on a pipe (which Windows doesn't support). Use
native file handles and system calls on Windows (which fixes a problem
with partial reads I ran into during testing).
This should fix bug 1759.
svn path=/trunk/; revision=29574
it's arguably the only place we _should_ use it. Add create_tempdir() to
tempfile.c and use it to create a temp directory for IP maps. This
should fix bug 3530.
(This still doesn't work on IE 8 / Vista here. IE gives an access denied
error in OpenLayers.js, but this is a separate issue).
svn path=/trunk/; revision=28920
AUTHORS-SHORT) into doc/. This cleans up the top-level Makefile.am (no more
need to have rules for each man page in both files) and solves the
parallel-build problem described in:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3494
svn path=/trunk/; revision=28784
This is in addition to the "tag checking" and will catch cases where a library file
has been updated w/o changing the tag. This patch re-enables checking previously done
except that now updates to config.nmake will also trigger the check.
svn path=/trunk/; revision=28722
The previous fix (SVN 28504) didn't quite work since
nmake always errored out if the libraries were not up-to-date; this
prevented doing an nmake ... setup.
This version of the fix:
1. Gets the library status (checktag) at the beginning of the make.
2. Effectively does the actual testing of the status whenever
a target with $(LIBS_CHECK) as a dependency is invoked.
Result: nmake ... [all] will error-out while nmake .... setup will
work properly.
Note that nmake ... setup will now show an initial error message
(from checktag) if the libraries are out of date; setup will still
proceed normally.
This is a slight change from the current behavior wherein no
error message occurs when nmake ... setup is invoked when the
libraries are out of date.
svn path=/trunk/; revision=28516
Reason:
The makefile was coded to do the checktag and libverify checks
only if makefile.nmake changed. It's now the case that some
library updates are reflected in config.nmake rather than in
Makefile.nmake and thus were missed.
Solution:
Do a checktag once at the beginning of the make.
Do not do a libverify any more. I think that checking
that the library 'tag' is correct is sufficient.
(The libverify code has been effectively commented out for now.
It can be removed at a later date once we're comfortable
with just using checktag).
--This line, and those below, will be ignored--
M Makefile.nmake
svn path=/trunk/; revision=28504
(I believe all the errors for gtk/... have been fixed);
Next up: Add the complete list of deprecated
GTK APIs to checkAPIs.pl
svn path=/trunk/; revision=27681
Replace this with the triple: "copy, if exist delete, rename" which isn't very nice but at least works on all machines
svn path=/trunk/; revision=27325
Copy help/faq.txt to FAQ in the NSIS and zip packages.
Add "help" to the dependency list for "all". Fix a couple of minor bugs
in the top-level Makfile.nmake.
svn path=/trunk/; revision=27173
Bill Meier