1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Commit Graph

94 Commits

Author SHA1 Message Date
Simon Tatham
98c4b69b08 Colin Watson reports a strange problem whereby krb5-config
incorporates the environment variable CFLAGS into its output. Avoid
exporting our version of it from the Makefile (which actually causes
build failures, since quoting phase issues mean that the backticks
in our version end up unexpanded).

[originally from svn r8399]
2009-01-08 18:18:14 +00:00
Simon Tatham
922ae38450 Fix punctuation in the large print statements. In particular, one
semicolon which crept in in r8138 was causing a lot of the "make
install" implementation to be missing from Makefile.gtk.

[originally from svn r8159]
[r8138 == de5dd9d65c]
2008-09-01 17:56:20 +00:00
Owen Dunn
de5dd9d65c Initial commit of GSSAPI Kerberos support.
[originally from svn r8138]
2008-08-10 13:10:31 +00:00
Simon Tatham
01adc7a8d2 Add an include statement to Makefile.gtk that imports if present a
file called Makefile.local. This means that if you're compiling on a
platform that needs COMPAT definitions, you can put them in a local
file and not have to type them on the command line every time.

[originally from svn r8045]
2008-06-05 17:06:39 +00:00
Simon Tatham
822628246e Merge out from trunk, to keep this branch viable. We are now up to
date as of r7913.

[originally from svn r7914]
[r7913 == d7eda6d99c]
2008-03-10 18:48:36 +00:00
Jacob Nevins
0f013108c3 This reordering of the Unix Makefiles (requested by Michael Shigorin) allows
use of -Wl,--as-needed.

[originally from svn r7299]
2007-02-18 22:05:45 +00:00
Simon Tatham
f042451e3c Switch round the order of CFLAGS and XFLAGS, so that the latter
comes last on the compiler command line. This makes it easier to
override the normal compile options (since conflicting command-line
options usually follow a last-wins policy) in order to compile (for
example) the Unix version -g -O0.

[originally from svn r7170]
2007-01-26 19:43:15 +00:00
Simon Tatham
f46e4e380c Tweak the GTK Makefile to build with GTK2 by default, while leaving
a means (`make GTK_CONFIG=gtk-config') of falling back to GTK1.

[originally from svn r7159]
2007-01-25 19:44:12 +00:00
Simon Tatham
f437af50f1 Update WINVER to 0x500 to avoid build failures from Jacob's
FlashWindow changes. Also fiddle with the <multimon.h> include,
which was subtly broken in turn by that.

[originally from svn r7120]
2007-01-16 21:32:02 +00:00
Jacob Nevins
89f7c2c8ce Add a NO_HTMLHELP option, and enable it by default in the Cygwin Makefile,
since even the latest version of w32api (3.6) shows no sign of HTMLHelp
support.

(This touches mkfiles.pl because that's where the details of what Cygwin
doesn't support are kept currently. This may be deliberate, so I haven't
changed it.)

[originally from svn r7032]
2006-12-28 20:56:01 +00:00
Owen Dunn
33b7caa590 Large file support for psftp and pscp on both Windows and Unix. On Unix
we set _FILE_OFFSET_BITS to 64 on the compiler command line (via mkfiles.pl),
and on Windows we use SetFilePointer and GetFileSize to cope with 64-bit sizes
where possible.  Not tested on Win9x.

[originally from svn r6783]
2006-08-12 15:20:19 +00:00
Jacob Nevins
5a81457608 Port r6710 from puzzles:
Patch from Ben Hutchings to prevent an ugly special case in
&splitline in which a line is `split' into a line ending in a
backslash followed by a completely blank line.

[originally from svn r6714]
[r6710 == fd90d1a7c8224e673361d8b23aadfa01829de77c in puzzles repository]
2006-05-21 12:20:42 +00:00
Jacob Nevins
4d48ba62e8 `win-versioninfo': all builds of all Windows binaries now contain
a VERSIONINFO resource. The versioning scheme is described in
windows/version.rc2.

Some .rc files are now #included in others. In order to keep MSVC
project files working, these have been renamed to .rc2; there may exist
a better solution.

(This checkin also includes the documentation tweak missing from r6367.)

Testing performed:
 - MinGW (cross-compiler): works
 - VC nmake: works (tested with VC6)
 - VC project files: builds with VERSIONINFO resource (no VER variable though)
 - Borland: an old version of this patch was tested with it and more or
   less worked, except that some of the VERSIONINFO strings were apparently
   not terminated properly. Not attempted to work around this.
 - LCC: not tested. Some fixes are in there from the last time we tried
   this, but then the build ultimately failed and I haven't tried this
   since that was fixed.
 - Dev-C++: untested. (Haven't done anything special.)
 - Unix Gtk/autoconf Makefiles work as before.

[originally from svn r6374]
[r6367 == f86ad059db]
[this svn revision also touched putty-wishlist]
2005-10-04 14:13:28 +00:00
Ben Harris
c1c27e9fb8 Add support for generating project files for use with Dev-C++, contributed
by Florian Gaab.

[originally from svn r6201]
2005-08-22 20:37:13 +00:00
Ben Harris
0227bfdbc7 Add a mechanism for using autoconf to detect the quirks of Unix systems
rather than relying on the user to edit the Makefile.  Makefile.gtk
still works as well as it ever did, but now we get a Makefile.in alongside
it.  mkunxarc.sh now relies on autoconf and friends to build the configure
script for the Unix source distribution.

[originally from svn r5673]
2005-04-25 15:55:06 +00:00
Jacob Nevins
492b3933f8 Retire MINGW32_FIX. It was a fix for a blatant bug in MinGW's windres, which
was fixed in CVS in 2000 (I think); and we now depend on MinGW much more
recent than that for various other reasons. I've tested with my current
MinGW (around 2.0.0 vintage) and the original symptoms (dodgy characters in
edit boxes) don't appear to show up.

[originally from svn r5491]
2005-03-11 15:52:59 +00:00
Jacob Nevins
1b3b065afc Allow mkfiles.pl to put multiple verbatim sections in a Makefile, and use
one of these for the MacOSX CFLAGS tweak.

[originally from svn r5404]
2005-02-26 17:30:41 +00:00
Jacob Nevins
a519e8edfc Add RT_MANIFEST arguments to dependencies for Windows resource objects.
[originally from svn r5393]
2005-02-24 22:45:50 +00:00
Simon Tatham
dc52b43cc3 Add plain-Unix binaries to the `make clean' list in the OS X makefile.
[originally from svn r5345]
2005-02-18 18:35:30 +00:00
Simon Tatham
46bfde32e8 Initial checkin of a native Mac OS X port, sharing most of its code
with the Unix port and layering a Cocoa GUI on top. The basics all
work: there's a configuration panel and a terminal window, the
timing interface works and the select interface functions. The same
application can run both SSH (or other network) connections and
local pty sessions, and multiple sessions in the same process are
fully supported.

However, it's horribly unfinished in a wide variety of other ways;
anyone interested is invited to read README.OSX and wince at the
length and content of its `unfinished' list.

[originally from svn r5308]
2005-02-15 21:45:50 +00:00
Ben Harris
6b1afc2a68 FWHACK has been dead for years. Remove it from the Makefiles.
[originally from svn r5113]
2005-01-15 18:30:05 +00:00
Owen Dunn
4be66f3a59 Throw away "./" in findfile so that the Mac makefile has valid paths.
[originally from svn r5111]
2005-01-15 17:16:48 +00:00
Ben Harris
2a37818026 Don't use GNUish pattern rules in the Unix Makefile, since they're not
supported by non-GNU makes.  This allows the standard Solaris /usr/ccs/bin/make
to handle that Makefile.

[originally from svn r5108]
2005-01-14 12:26:38 +00:00
Simon Tatham
cb45b9cc25 Now that we have Subversion's file renaming ability, it's time at
long last to move all the Windows-specific source files down into a
`windows' subdirectory. Only platform-specific files remain at the
top level. With any luck this will act as a hint to anyone still
contemplating sending us a Windows-centric patch...

[originally from svn r4792]
2004-11-16 22:14:56 +00:00
Jacob Nevins
847f86892d Typos in Borland Makefile pointed out by Arnaud Desitter
[originally from svn r4256]
2004-05-24 17:12:42 +00:00
Simon Tatham
1e13fdc572 More portability fixes.
[originally from svn r4137]
2004-04-25 09:26:52 +00:00
Simon Tatham
7bd6bec8e4 Make mkfiles.pl less tied to PuTTY in particular, by inventing new
directives that allow me to move some of the PuTTY-specific Makefile
fragments into Recipe. Not complete yet, but ought to be enough for
me to at least _try_ using mkfiles.pl in another project.

[originally from svn r4136]
2004-04-25 09:04:38 +00:00
Simon Tatham
b433ee662e Oh yes, and the Unix Makefile needs to know that as well.
[originally from svn r3969]
2004-03-24 19:51:59 +00:00
Jacob Nevins
a1ba4be490 Add .map files to Cygwin "clean" target
[originally from svn r3862]
2004-02-13 00:41:44 +00:00
Jacob Nevins
8b2e775547 Makefile.cyg now generates a link map.
[originally from svn r3861]
2004-02-13 00:40:45 +00:00
Simon Tatham
ade0cb3d84 Added a wrinkle to the version.c build in the Unix makefile, which
will validate an md5sums manifest and if all md5sums match will use
a version number provided in a file. This should allow me to produce
a Unix release source archive with the property that when unpacked
and built it will produce binaries advertising themselves as
`Release X.YZ', but as soon as the user starts fiddling with the
sources it will revert to `Unidentified build' (though of course the
user can still _explicitly_ ask for a release tag, and in fact this
will override the default if any default is specified).

[originally from svn r3818]
2004-02-07 18:10:54 +00:00
Simon Tatham
f6adc8a9e1 Alexey Savelyev's mkfiles.pl patch to support lcc-win32. This has
caused a small amount of extra inconvenience at the tops of .rc
files, but it's been positive overall since lcc has managed to point
out some pedantic errors (typically static/extern mismatches between
function prototypes and definitions) which everything else missed.

[originally from svn r3744]
2004-01-20 20:35:27 +00:00
Simon Tatham
fb8d264f28 Joe Yates's patch to make mkfiles.pl generate Visual Studio project
files as well as an nmake makefile. Needed line-end tweakery in
order to be able to generate usable project files when run on Unix,
but other than that appears fine. Ooh!

[originally from svn r3721]
2004-01-17 13:48:40 +00:00
Simon Tatham
b601727068 So _that's_ why mkfiles.pl was running so slowly on my Windows box!
&findfile() now caches its results. At least one full order of
magnitude speedup when running on an SMB-mounted volume. Phew.

[originally from svn r3720]
2004-01-17 13:24:59 +00:00
Ben Harris
f68c785aa4 Add support for a DESTDIR variable in the Unix makefile to set the root of the
installation tree (for building packages etc).

[originally from svn r3433]
2003-09-01 21:27:36 +00:00
Ben Harris
f97b7768ab Remove -DNO_SECURITY from the cygwin build, since <aclapi.h> has been
available in cygwin for a year and a half.
Pointed out by Bruno Kozlowski.

[originally from svn r3282]
2003-06-21 19:34:36 +00:00
Simon Tatham
041dcfd83d Unix makefile now uses -O2, which massively cuts down key exchange
time. This gives rise to a whole bunch of spare warnings, one or two
of which might have been actual bugs; now all resolved.

[originally from svn r3134]
2003-04-23 13:48:09 +00:00
Simon Tatham
54d5f41c95 I'm sick of having to type (cd ..; perl mkfiles.pl) when I'm working
on Unix. So now mkfiles.pl will look in .. as well as . when
searching for Recipe, so I can run `perl ../mkfiles.pl' and it will
Just Work.

[originally from svn r3016]
2003-03-29 17:07:31 +00:00
Simon Tatham
2ddf9f54de Add some parentheses for general robustness. (In particular I just
tried to run mkfiles.pl on Perl 5.005_03 and it didn't work without
them.)

[originally from svn r2885]
2003-02-24 22:39:14 +00:00
Ben Harris
3543ba3ec9 Set the executable fragment name (in CFM builds) to the name of the target
pgram, rather than to "PuTTY" unconditionally.

[originally from svn r2883]
2003-02-23 13:42:34 +00:00
Ben Harris
160277515b I think the Carbon build now works well enough to be worth turning on by
default.  It's not particularly useful, but it runs.

[originally from svn r2882]
2003-02-23 13:34:14 +00:00
Ben Harris
fb90fa8650 Change some of the blocks of cut&pasted code into loops.
[originally from svn r2873]
2003-02-20 22:22:14 +00:00
Ben Harris
b5133bc164 Ask for traceback tables in PowerPC objects, since that should make
tracking down crashes easier.

[originally from svn r2872]
2003-02-20 00:40:39 +00:00
Ben Harris
60c9d7bae3 Clean up Carbon build procedures somewhat. I still don't have anything that
actually works, but I think I'm getting closer.

[originally from svn r2810]
2003-02-07 01:33:24 +00:00
Ben Harris
60b6419de5 Add support for using Navigation Services to open saved sessions.
Support for saving sessions using Navigation Services will come later.

[originally from svn r2779]
2003-02-02 15:59:00 +00:00
Ben Harris
fc17465c33 Add some glue to allow building a Carbon version of PuTTY. It won't
work, but it's nice to have the infrastructure in place.

[originally from svn r2772]
2003-02-01 22:20:53 +00:00
Ben Harris
3e09c5afa1 Enable -Werror in GTK builds (we already have -Wall, so more GCCisms aren't
_that_ evil).

[originally from svn r2667]
2003-01-20 20:15:28 +00:00
Ben Harris
ff0d8bae10 Clear the "Inited" bit when we finish building each executable, in a bid
to get the Finder to look at the new 'BNDL' resource.

[originally from svn r2637]
2003-01-18 12:19:04 +00:00
Ben Harris
f3eff8b5de Use memset() rather than OTMemzero(), and hence remove the need to weak link
against OTUtilityLib.

[originally from svn r2550]
2003-01-12 01:37:24 +00:00
Ben Harris
f9300b0011 Initial import of Owen's OpenTransport interface. It doesn't work yet, but
it does compile and link.

[originally from svn r2547]
2003-01-11 23:33:57 +00:00