X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Recipe;h=bac258f18b8fc5bf5f2164d1255ecfa3482e6a63;hb=2856422eab2169928a44ebbf00e8b8d8ad7e5916;hp=5d13c2cdb6671a67efbe67700d85164191cf0b87;hpb=89f4cf6a0a6bde2885287cd9cc8f95d639fe99a0;p=PuTTY.git

diff --git a/Recipe b/Recipe
index 5d13c2cd..bac258f1 100644
--- a/Recipe
+++ b/Recipe
@@ -18,12 +18,17 @@
 !makefile borland windows/Makefile.bor
 !makefile lcc windows/Makefile.lcc
 !makefile gtk unix/Makefile.gtk
-!makefile mpw mac/Makefile.mpw
+!makefile unix unix/Makefile.ux
+!makefile am Makefile.am
+!makefile osx macosx/Makefile
+!makefile devcppproj windows/DEVCPP
+!makefile vstudio10 windows/VS2010
+!makefile vstudio12 windows/VS2012
 # Source directories.
 !srcdir charset/
 !srcdir windows/
 !srcdir unix/
-!srcdir mac/
+!srcdir macosx/
 
 # Help text added to the top of each Makefile, with /D converted
 # into -D as appropriate for the particular Makefile.
@@ -32,27 +37,16 @@
 #
 # Extra options you can set:
 #
-#  - FWHACK=/DFWHACK
-#      Enables a hack that tunnels through some firewall proxies.
-#
-#  - VER=/DSNAPSHOT=1999-01-25
-#      Generates executables whose About box report them as being a
-#      development snapshot.
-#
-#  - VER=/DRELEASE=0.43
-#      Generates executables whose About box report them as being a
-#      release version.
-#
-#  - COMPAT=/DAUTO_WINSOCK
+#  - COMPAT=/DAUTO_WINSOCK (Windows only)
 #      Causes PuTTY to assume that <windows.h> includes its own WinSock
 #      header file, so that it won't try to include <winsock.h>.
 #
-#  - COMPAT=/DWINSOCK_TWO
+#  - COMPAT=/DWINSOCK_TWO (Windows only)
 #      Causes the PuTTY utilities to include <winsock2.h> instead of
 #      <winsock.h>, except Plink which _needs_ WinSock 2 so it already
 #      does this.
 #
-#  - COMPAT=/DNO_SECURITY
+#  - COMPAT=/DNO_SECURITY (Windows only)
 #      Disables Pageant's use of <aclapi.h>, which is not available
 #      with some development environments (such as older versions of
 #      the Cygwin/mingw GNU toolchain). This means that Pageant
@@ -62,7 +56,7 @@
 #      will run fine on Win95-series OSes where there is no access
 #      control anyway).
 #
-#  - COMPAT=/DNO_MULTIMON
+#  - COMPAT=/DNO_MULTIMON (Windows only)
 #      Disables PuTTY's use of <multimon.h>, which is not available
 #      with some development environments. This means that PuTTY's
 #      full-screen mode (configurable to work on Alt-Enter) will
@@ -72,16 +66,45 @@
 #      build, since at the time of writing this <multimon.h> is
 #      known not to be available in Cygwin.
 #
-#  - COMPAT=/DMSVC4
+#  - COMPAT=/DNO_HTMLHELP (Windows only)
+#      Disables PuTTY's use of <htmlhelp.h>, which is not available
+#      with some development environments. The resulting binary
+#      will only look for an old-style WinHelp file (.HLP/.CNT), and
+#      will ignore any .CHM file.
+#
+#      Note that this definition is always enabled in the Cygwin
+#      build, since at the time of writing this <htmlhelp.h> is
+#      known not to be available in Cygwin (although you can use
+#      the htmlhelp.h supplied with HTML Help Workshop).
+#
+#  - RCFL=/DNO_MANIFESTS (Windows only)
+#      Disables inclusion of XML application manifests in the PuTTY
+#      binaries. This may be necessary to build for 64-bit Windows;
+#      the manifests are only included to use the XP GUI style on
+#      Windows XP, and the architecture tags are a lie on 64-bit.
+#
+#  - COMPAT=/DNO_IPV6
+#      Disables PuTTY's ability to make IPv6 connections, enabling
+#      it to compile under development environments which do not
+#      support IPv6 in their header files.
+#
+#  - COMPAT=/DNO_GSSAPI
+#      Disables PuTTY's ability to use GSSAPI functions for
+#      authentication and key exchange.
+#
+#  - COMPAT=/DSTATIC_GSSAPI
+#      Causes PuTTY to try to link statically against the GSSAPI
+#      library instead of the default of doing it at run time.
+#
+#  - COMPAT=/DMSVC4 (Windows only)
 #  - RCFL=/DMSVC4
 #      Makes a couple of minor changes so that PuTTY compiles using
 #      MSVC 4. You will also need /DNO_SECURITY and /DNO_MULTIMON.
 #
-#  - RCFL=/DASCIICTLS
-#      Uses ASCII rather than Unicode to specify the tab control in
-#      the resource file. Probably most useful when compiling with
-#      Cygnus/mingw32, whose resource compiler may have less of a
-#      problem with it.
+#  - COMPAT=/DNO_SECUREZEROMEMORY (Windows only)
+#      Disables PuTTY's use of SecureZeroMemory(), which is missing
+#      from some environments' header files.  This is enabled by
+#      default in the Cygwin Makefile.
 #
 #  - XFLAGS=/DTELNET_DEFAULT
 #      Causes PuTTY to default to the Telnet protocol (in the absence
@@ -95,7 +118,7 @@
 #      Causes PuTTY to emit a file called putty_mem.log, logging every
 #      memory allocation and free, so you can track memory leaks.
 #
-#  - XFLAGS=/DMINEFIELD
+#  - XFLAGS=/DMINEFIELD (Windows only)
 #      Causes PuTTY to use a custom memory allocator, similar in
 #      concept to Electric Fence, in place of regular malloc(). Wastes
 #      huge amounts of RAM, but should cause heap-corruption bugs to
@@ -107,50 +130,25 @@
 # ------------------------------------------------------------
 # Additional text added verbatim to each individual Makefile.
 
-# Hack to force version.o to be rebuilt always.
-!begin vc
-version.obj: *.c *.h *.rc
-	cl $(FWHACK) $(VER) $(CFLAGS) /c ..\version.c
-!end
-!specialobj vc version
-!begin cygwin
-version.o: FORCE
-FORCE:
-	$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c
-!end
-!specialobj cygwin version
-!begin borland
-version.obj: FORCE
-FORCE:
-	bcc32 $(FWHACK) $(VER) $(CFLAGS) /c ..\version.c
+!begin vc vars
+CFLAGS = $(CFLAGS) /DHAS_GSSAPI
 !end
-!specialobj borland version
-!begin lcc
-version.o: FORCE
-FORCE:
-	lcc $(FWHACK) $(VER) $(CFLAGS) /c ..\version.c
-!end
-!specialobj lcc version
-# For Unix, we also need the gross MD5 hack that causes automatic
-# version number selection in release source archives.
-!begin gtk
-version.o: FORCE;
-FORCE:
-	if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \
-		$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
-	else \
-		$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
-	fi
-!end
-!specialobj gtk version
 
 # `make install' target for Unix.
 !begin gtk
 install:
+	mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
 	$(INSTALL_PROGRAM) -m 755 plink $(DESTDIR)$(bindir)/plink
 	$(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp
 	$(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp
 	$(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm
+	if test -n "$(UTMP_GROUP)"; then \
+	  chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \
+	    chmod 2755 $(DESTDIR)$(bindir)/pterm; \
+	elif test -n "$(UTMP_USER)"; then \
+	  chown $(UTMP_USER) $(DESTDIR)$(bindir)/pterm && \
+	    chmod 4755 $(DESTDIR)$(bindir)/pterm; \
+	fi
 	$(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty
 	$(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen
 	$(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel
@@ -165,6 +163,33 @@ install:
 install-strip:
 	$(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s"
 !end
+!begin osx vars
+CFLAGS += -DMACOSX
+!end
+
+# List the man pages for the automake makefile.
+!begin am
+man1_MANS = doc/plink.1 doc/pscp.1 doc/psftp.1 doc/pterm.1 \
+            doc/putty.1 doc/puttygen.1 doc/puttytel.1
+!end
+
+# In automake, chgrp/chmod pterm after installation, if configured to.
+!begin am
+if HAVE_SETID_CMD
+install-exec-local:
+	@SETID_CMD@ $(bindir)/pterm
+	chmod @SETID_MODE@ $(bindir)/pterm
+endif
+!end
+
+# Random symbols.
+!begin cygwin vars
+# _WIN32_IE is required to expose identifiers that only make sense on
+# systems with IE5+ installed, such as some arguments to SHGetFolderPath().
+# WINVER etc perform a similar function for FlashWindowEx().
+CFLAGS += -D_WIN32_IE=0x0500
+CFLAGS += -DWINVER=0x0500 -D_WIN32_WINDOWS=0x0410 -D_WIN32_WINNT=0x0500
+!end
 
 # ------------------------------------------------------------
 # Definitions of object groups. A group name, followed by an =,
@@ -174,15 +199,16 @@ install-strip:
 
 # Terminal emulator and its (platform-independent) dependencies.
 TERMINAL = terminal wcwidth ldiscucs logging tree234 minibidi
-         + config dialog
+         + config dialog conf
 
 # GUI front end and terminal emulator (putty, puttytel).
 GUITERM  = TERMINAL window windlg winctrls sizetip winucs winprint
-         + winutils wincfg
+         + winutils wincfg sercfg winhelp winjump
 
 # Same thing on Unix.
-UXTERM   = TERMINAL pterm uxcfg gtkdlg gtkcols gtkpanel uxucs uxprint xkeysym
-         + timing
+UXTERM   = TERMINAL uxcfg sercfg uxucs uxprint timing callback
+GTKTERM  = UXTERM gtkwin gtkcfg gtkdlg gtkfont gtkcols xkeysym
+OSXTERM  = UXTERM osxwin osxdlg osxctrls
 
 # Non-SSH back ends (putty, puttytel, plink).
 NONSSH   = telnet raw rlogin ldisc pinger
@@ -190,80 +216,87 @@ NONSSH   = telnet raw rlogin ldisc pinger
 # SSH back end (putty, plink, pscp, psftp).
 SSH      = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf
          + sshdh sshcrcda sshpubk sshzlib sshdss x11fwd portfwd
-         + sshaes sshsh512 sshbn wildcard pinger
-WINSSH   = SSH winnoise winpgntc
-UXSSH    = SSH uxnoise uxagentc
-MACSSH   = SSH macnoise
+         + sshaes sshsh256 sshsh512 sshbn wildcard pinger ssharcf
+         + sshgssc pgssapi sshshare
+WINSSH   = SSH winnoise winsecur winpgntc wingss winshare winnps winnpc
+         + winhsock errsock
+UXSSH    = SSH uxnoise uxagentc uxgss uxshare
 
 # SFTP implementation (pscp, psftp).
 SFTP     = sftp int64 logging
 
 # Miscellaneous objects appearing in all the network utilities (not
 # Pageant or PuTTYgen).
-MISC     = timing misc version settings tree234 proxy
-WINMISC  = MISC winstore winnet cmdline windefs winmisc pproxy
-UXMISC   = MISC uxstore uxsel uxnet cmdline uxmisc uxproxy
-MACMISC  = MISC macstore macnet mtcpnet otnet macmisc macabout pproxy
+MISC     = timing callback misc version settings tree234 proxy conf
+WINMISC  = MISC winstore winnet winhandl cmdline windefs winmisc winproxy
+         + wintime winhsock errsock
+UXMISC   = MISC uxstore uxsel uxnet cmdline uxmisc uxproxy time
+OSXMISC  = MISC uxstore uxsel osxsel uxnet uxmisc uxproxy time
 
 # Character set library, for use in pterm.
 CHARSET  = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc
 
 # Standard libraries.
 LIBS     = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib
-         + shell32.lib winmm.lib imm32.lib winspool.lib
+         + shell32.lib winmm.lib imm32.lib winspool.lib ole32.lib
 
 # Network backend sets. This also brings in the relevant attachment
 # to proxy.c depending on whether we're crypto-avoidant or not.
 BE_ALL   = be_all cproxy
 BE_NOSSH = be_nossh nocproxy
-BE_SSH   = be_none cproxy
+BE_SSH   = be_ssh cproxy
 BE_NONE  = be_none nocproxy
+# More backend sets, with the additional Windows serial-port module.
+W_BE_ALL = be_all_s winser cproxy
+W_BE_NOSSH = be_nos_s winser nocproxy
+# And with the Unix serial-port module.
+U_BE_ALL = be_all_s uxser cproxy
+U_BE_NOSSH = be_nos_s uxser nocproxy
 
 # ------------------------------------------------------------
 # Definitions of actual programs. The program name, followed by a
 # colon, followed by a list of objects. Also in the list may be the
 # keywords [G] for Windows GUI app, [C] for Console app, [X] for
-# X/GTK Unix app, [U] for command-line Unix app, [M] for Macintosh app.
+# X/GTK Unix app, [U] for command-line Unix app.
 
-putty    : [G] GUITERM NONSSH WINSSH BE_ALL WINMISC win_res.res LIBS
-puttytel : [G] GUITERM NONSSH BE_NOSSH WINMISC win_res.res LIBS
-plink    : [C] winplink wincons NONSSH WINSSH BE_ALL logging WINMISC
-         + plink.res LIBS
+putty    : [G] GUITERM NONSSH WINSSH W_BE_ALL WINMISC winx11 putty.res LIBS
+puttytel : [G] GUITERM NONSSH W_BE_NOSSH WINMISC puttytel.res nogss LIBS
+plink    : [C] winplink wincons NONSSH WINSSH W_BE_ALL logging WINMISC
+         + winx11 plink.res winnojmp noterm LIBS
 pscp     : [C] pscp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
-         + pscp.res LIBS
-psftp    : [C] psftp winsftp wincons WINSSH BE_SSH SFTP WINMISC pscp.res LIBS
+         + pscp.res winnojmp LIBS
+psftp    : [C] psftp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
+         + psftp.res winnojmp LIBS
 
 pageant  : [G] winpgnt sshrsa sshpubk sshdes sshbn sshmd5 version tree234
-         + misc sshaes sshsha winpgntc sshdss sshsh512 winutils winmisc
-         + pageant.res LIBS
+         + misc sshaes sshsha winsecur winpgntc sshdss sshsh256 sshsh512
+	 + winutils winmisc winhelp conf pageant.res LIBS
 
 puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshrand winnoise sshsha winstore misc winctrls sshrsa sshdss winmisc
-         + sshpubk sshaes sshsh512 import winutils puttygen.res tree234
-	 + notiming LIBS
+         + sshpubk sshaes sshsh256 sshsh512 import winutils puttygen.res
+	 + tree234 notiming winhelp winnojmp conf LIBS wintime
 
-pterm    : [X] UXTERM uxmisc misc ldisc settings pty uxsel BE_NONE uxstore
-         + signal CHARSET cmdline ptermm version
-putty    : [X] UXTERM uxmisc misc ldisc settings pty uxsel BE_ALL uxstore
-         + signal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11
-puttytel : [X] UXTERM uxmisc misc ldisc settings pty uxsel BE_NOSSH
-	 + uxstore signal CHARSET uxputty NONSSH UXMISC
+pterm    : [X] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore
+         + uxsignal CHARSET cmdline uxpterm version time xpmpterm xpmptcfg
+	 + nogss
+putty    : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_ALL uxstore
+         + uxsignal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11 xpmputty
+         + xpmpucfg
+puttytel : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_NOSSH
+	 + uxstore uxsignal CHARSET uxputty NONSSH UXMISC xpmputty xpmpucfg
+	 + nogss
 
-plink    : [U] uxplink uxcons NONSSH UXSSH BE_ALL logging UXMISC signal ux_x11
+plink    : [U] uxplink uxcons NONSSH UXSSH U_BE_ALL logging UXMISC uxsignal
+         + ux_x11 noterm
 
 puttygen : [U] cmdgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshrand uxnoise sshsha misc sshrsa sshdss uxcons uxstore uxmisc
-         + sshpubk sshaes sshsh512 import puttygen.res tree234 uxgen notiming
+         + sshpubk sshaes sshsh256 sshsh512 import puttygen.res time tree234
+	 + uxgen notiming conf
 
 pscp     : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC
-psftp    : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP UXMISC
+psftp    : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC
 
-PuTTY    : [M] terminal wcwidth ldiscucs logging BE_ALL mac macdlg macevlog
-         + macterm macucs mac_res.rsrc testback NONSSH MACSSH MACMISC CHARSET
-         + stricmp vsnprint dialog config macctrls
-PuTTYtel : [M] terminal wcwidth ldiscucs logging BE_NOSSH mac macdlg
-	 + macevlog macterm macucs mac_res.rsrc testback NONSSH MACMISC
-	 + CHARSET stricmp vsnprint dialog config macctrls
-PuTTYgen : [M] macpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
-         + sshrand macnoise sshsha macstore misc sshrsa sshdss macmisc sshpubk
-         + sshaes sshsh512 import macpgen.rsrc macpgkey macabout
+PuTTY    : [MX] osxmain OSXTERM OSXMISC CHARSET U_BE_ALL NONSSH UXSSH
+         + ux_x11 uxpty uxsignal testback putty.icns info.plist