X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Recipe;h=a2698baaf15c36d2a94b7f46908d1c982b48333d;hb=9ce982622f9ab07b85cbb06d06f53b71fb9558a9;hp=dee4da8ff4840ceb4b2c0c2139eb7832f33a72e1;hpb=75c79e318fffc6db076861856c1320fcea849bf2;p=PuTTY.git diff --git a/Recipe b/Recipe index dee4da8f..a2698baa 100644 --- a/Recipe +++ b/Recipe @@ -12,21 +12,22 @@ # Overall project name. !name putty # Locations and types of output Makefiles. +!makefile clangcl windows/Makefile.clangcl !makefile vc windows/Makefile.vc !makefile vcproj windows/MSVC -!makefile cygwin windows/Makefile.cyg +!makefile cygwin windows/Makefile.mgw !makefile borland windows/Makefile.bor !makefile lcc windows/Makefile.lcc !makefile gtk unix/Makefile.gtk !makefile unix unix/Makefile.ux -!makefile am unix/Makefile.am -!makefile osx macosx/Makefile +!makefile am Makefile.am !makefile devcppproj windows/DEVCPP +!makefile vstudio10 windows/VS2010 +!makefile vstudio12 windows/VS2012 # Source directories. !srcdir charset/ !srcdir windows/ !srcdir unix/ -!srcdir macosx/ # Help text added to the top of each Makefile, with /D converted # into -D as appropriate for the particular Makefile. @@ -35,14 +36,6 @@ # # Extra options you can set: # -# - VER="/DSNAPSHOT=1999-01-25 /DSVN_REV=1234" -# Generates executables whose About box report them as being a -# development snapshot. SVN_REV is a Subversion revision number. -# -# - VER=/DRELEASE=0.43 -# Generates executables whose About box report them as being a -# release version. -# # - COMPAT=/DAUTO_WINSOCK (Windows only) # Causes PuTTY to assume that includes its own WinSock # header file, so that it won't try to include . @@ -53,14 +46,16 @@ # does this. # # - COMPAT=/DNO_SECURITY (Windows only) -# Disables Pageant's use of , which is not available -# with some development environments (such as older versions of -# the Cygwin/mingw GNU toolchain). This means that Pageant -# won't care about the local user ID of processes accessing it; a -# version of Pageant built with this option will therefore refuse -# to run under NT-series OSes on security grounds (although it -# will run fine on Win95-series OSes where there is no access -# control anyway). +# Disables use of , which is not available with some +# development environments (such as very old versions of the +# mingw/Cygwin GNU toolchain). This has the following effects: +# - Pageant won't care about the local user ID of processes +# accessing it; a version of Pageant built with this option +# will therefore refuse to run under NT-series OSes on +# security grounds (although it will run fine on Win95-series +# OSes where there is no access control anyway). +# - SSH connection sharing is disabled. +# - There is no support for restriction of the process ACLs. # # - COMPAT=/DNO_MULTIMON (Windows only) # Disables PuTTY's use of , which is not available @@ -68,20 +63,14 @@ # full-screen mode (configurable to work on Alt-Enter) will # not behave usefully in a multi-monitor environment. # -# Note that this definition is always enabled in the Cygwin -# build, since at the time of writing this is -# known not to be available in Cygwin. -# # - COMPAT=/DNO_HTMLHELP (Windows only) # Disables PuTTY's use of , 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 is -# known not to be available in Cygwin (although you can use -# the htmlhelp.h supplied with HTML Help Workshop). +# If you don't have this header, you may be able to use the copy +# supplied with HTML Help Workshop. # # - RCFL=/DNO_MANIFESTS (Windows only) # Disables inclusion of XML application manifests in the PuTTY @@ -107,16 +96,9 @@ # Makes a couple of minor changes so that PuTTY compiles using # MSVC 4. You will also need /DNO_SECURITY and /DNO_MULTIMON. # -# - RCFL=/DASCIICTLS (Windows only) -# 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. +# from some environments' header files. # # - XFLAGS=/DTELNET_DEFAULT # Causes PuTTY to default to the Telnet protocol (in the absence @@ -137,84 +119,38 @@ # show up as GPFs at the point of failure rather than appearing # later on as second-level damage. # +# - XFLAGS=/DFUZZING +# Builds a version of PuTTY with some tweaks to make fuzz testing +# easier: the SSH random number generator is replaced by one that +# always returns the same thing. Note that this makes SSH +# completely insecure -- a FUZZING build should never be used to +# connect to a real server. !end # ------------------------------------------------------------ # 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 $(VER) $(CFLAGS) /c ..\version.c -!end -!specialobj vc version -!begin cygwin -version.o: FORCE - $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c -!end -!specialobj cygwin version -!begin borland -version.obj: FORCE - bcc32 $(VER) $(CFLAGS) /c ..\version.c -!end -!specialobj borland version -!begin lcc -version.obj: FORCE - lcc $(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 - if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \ - $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \ - else \ - $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \ - fi -!end -!specialobj gtk version -# In the automake build, we have to do the whole job by supplying -# extra CFLAGS, so we have to put the if statement inside one big -# backtick expression. We also force rebuilding via a -D option that -# makes version.o include empty.h, which we construct ourselves and -# touch whenever any source file is updated. -!cflags am version $(VER) -DINCLUDE_EMPTY_H `if test -z "$(VER)" && (cd $(srcdir)/..; md5sum -c manifest >/dev/null 2>&1); then cat $(srcdir)/../version.def; else echo "$(VER)"; fi` +!cflags am version !begin am +if AUTO_GIT_COMMIT BUILT_SOURCES = empty.h +CLEANFILES = empty.h +libversion_a_CFLAGS += -DSOURCE_COMMIT=\"`git --git-dir=$(srcdir)/.git rev-parse HEAD 2>/dev/null`\" empty.h: $(allsources) echo '/* Empty file touched by automake makefile to force rebuild of version.o */' >$@ - +endif !end !begin >empty.h /* Empty file touched by automake makefile to force rebuild of version.o */ !end -# Add VER to Windows resource targets, and force them to be rebuilt every -# time, on the assumption that they will contain version information. !begin vc vars -CFLAGS = $(CFLAGS) /DHAS_GSSAPI /DSECURITY_WIN32 -RCFLAGS = $(RCFLAGS) $(VER) -!end -!begin cygwin vars -CFLAGS += -DSECURITY_WIN32 -# XXX GNU-ism, but it's probably all right for a Cygwin/MinGW Makefile. -RCFLAGS += $(patsubst -D%,--define %,$(VER)) +CFLAGS = $(CFLAGS) /DHAS_GSSAPI !end -!begin borland vars -# Borland doesn't support +=. This probably shouldn't work, but seems to. -RCFLAGS = $(RCFLAGS) $(VER) -!end -!begin lcc vars -RCFLAGS += $(VER) + +!begin clangcl vars +CFLAGS += /DHAS_GSSAPI !end -!forceobj putty.res -!forceobj puttytel.res -!forceobj plink.res -!forceobj pscp.res -!forceobj psftp.res -!forceobj pageant.res -!forceobj puttygen.res # `make install' target for Unix. !begin gtk @@ -245,14 +181,15 @@ 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 +if HAVE_GTK +man1_MANS = doc/plink.1 doc/pscp.1 doc/psftp.1 doc/puttygen.1 \ + doc/pageant.1 doc/pterm.1 doc/putty.1 doc/puttytel.1 +else +man1_MANS = doc/plink.1 doc/pscp.1 doc/psftp.1 doc/puttygen.1 +endif !end # In automake, chgrp/chmod pterm after installation, if configured to. @@ -264,6 +201,18 @@ install-exec-local: endif !end +# In automake makefile, build the OS X app bundle, if configured in +# Quartz mode. +!begin am +if HAVE_QUARTZ +noinst_SCRIPTS = unix/PuTTY.app unix/Pterm.app +unix/PuTTY.app: unix/putty.bundle puttyapp osxlaunch + rm -rf $@ && gtk-mac-bundler $< +unix/Pterm.app: unix/pterm.bundle ptermapp osxlaunch + rm -rf $@ && gtk-mac-bundler $< +endif +!end + # Random symbols. !begin cygwin vars # _WIN32_IE is required to expose identifiers that only make sense on @@ -285,12 +234,12 @@ TERMINAL = terminal wcwidth ldiscucs logging tree234 minibidi # GUI front end and terminal emulator (putty, puttytel). GUITERM = TERMINAL window windlg winctrls sizetip winucs winprint - + winutils wincfg sercfg winhelp winjump + + winutils wincfg sercfg winhelp winjump miscucs # Same thing on Unix. -UXTERM = TERMINAL uxcfg sercfg uxucs uxprint timing callback -GTKTERM = UXTERM gtkwin gtkcfg gtkdlg gtkfont gtkcols xkeysym -OSXTERM = UXTERM osxwin osxdlg osxctrls +UXTERM = TERMINAL uxcfg sercfg uxucs uxprint timing callback miscucs +GTKTERM = UXTERM gtkwin gtkcfg gtkdlg gtkfont gtkcols gtkmisc xkeysym + + x11misc gtkcomm # Non-SSH back ends (putty, puttytel, plink). NONSSH = telnet raw rlogin ldisc pinger @@ -298,21 +247,25 @@ 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 sshsh256 sshsh512 sshbn wildcard pinger ssharcf - + sshgssc pgssapi -WINSSH = SSH winnoise winpgntc wingss -UXSSH = SSH uxnoise uxagentc uxgss + + sshaes sshccp sshsh256 sshsh512 sshbn wildcard pinger ssharcf + + sshgssc pgssapi sshshare sshecc aqsync +WINSSH = SSH winnoise wincapi 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 callback misc version settings tree234 proxy conf +MISC = timing callback misc version settings tree234 proxy conf be_misc WINMISC = MISC winstore winnet winhandl cmdline windefs winmisc winproxy - + wintime -UXMISC = MISC uxstore uxsel uxnet cmdline uxmisc uxproxy time -OSXMISC = MISC uxstore uxsel osxsel uxnet uxmisc uxproxy time + + wintime winhsock errsock winsecur +UXMISC = MISC uxstore uxsel uxnet uxpeer cmdline uxmisc uxproxy time + +# import.c and dependencies, for PuTTYgen-like utilities that have to +# load foreign key files. +IMPORT = import sshbcrypt sshblowf # Character set library, for use in pterm. CHARSET = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc @@ -343,41 +296,72 @@ U_BE_NOSSH = be_nos_s uxser nocproxy 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 LIBS + + winx11 plink.res winnojmp noterm LIBS pscp : [C] pscp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC + 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 sshsh256 sshsh512 winutils - + winmisc winhelp conf pageant.res LIBS +pageant : [G] winpgnt pageant sshrsa sshpubk sshdes sshbn sshmd5 version + + tree234 misc sshaes sshsha winsecur winpgntc aqsync sshdss sshsh256 + + sshsh512 winutils sshecc 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 sshsh256 sshsh512 import winutils puttygen.res - + tree234 notiming winhelp winnojmp conf LIBS wintime + + sshpubk sshaes sshsh256 sshsh512 IMPORT winutils puttygen.res + + tree234 notiming winhelp winnojmp conf LIBS wintime sshecc + + sshecdsag winsecur pterm : [X] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore + uxsignal CHARSET cmdline uxpterm version time xpmpterm xpmptcfg - + nogss + + nogss gtkmain putty : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_ALL uxstore + uxsignal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11 xpmputty - + xpmpucfg + + xpmpucfg gtkmain puttytel : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_NOSSH + uxstore uxsignal CHARSET uxputty NONSSH UXMISC xpmputty xpmpucfg - + nogss + + nogss gtkmain plink : [U] uxplink uxcons NONSSH UXSSH U_BE_ALL logging UXMISC uxsignal - + ux_x11 + + ux_x11 noterm uxnogtk -puttygen : [U] cmdgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version +PUTTYGEN_UNIX = sshrsag sshdssg sshprime sshdes sshbn sshmd5 version + sshrand uxnoise sshsha misc sshrsa sshdss uxcons uxstore uxmisc - + sshpubk sshaes sshsh256 sshsh512 import puttygen.res time tree234 - + uxgen notiming conf + + sshpubk sshaes sshsh256 sshsh512 IMPORT puttygen.res time tree234 + + uxgen notiming conf sshecc sshecdsag uxnogtk +puttygen : [U] cmdgen PUTTYGEN_UNIX +cgtest : [UT] cgtest PUTTYGEN_UNIX + +pscp : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC uxnogtk +psftp : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC uxnogtk -pscp : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC -psftp : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC +pageant : [X] uxpgnt uxagentc aqsync pageant sshrsa sshpubk sshdes sshbn + + sshmd5 version tree234 misc sshaes sshsha sshdss sshsh256 sshsh512 + + sshecc conf uxsignal nocproxy nogss be_none x11fwd ux_x11 uxcons + + gtkask gtkmisc UXMISC -PuTTY : [MX] osxmain OSXTERM OSXMISC CHARSET U_BE_ALL NONSSH UXSSH - + ux_x11 uxpty uxsignal testback putty.icns info.plist +ptermapp : [XT] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore + + uxsignal CHARSET cmdline uxpterm version time xpmpterm xpmptcfg + + nogss gtkapp +puttyapp : [XT] GTKTERM uxmisc misc ldisc settings uxsel U_BE_ALL uxstore + + uxsignal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11 xpmputty + + xpmpucfg gtkapp +osxlaunch : [UT] osxlaunch + +fuzzterm : [UT] UXTERM CHARSET misc version uxmisc uxucs fuzzterm time settings + + uxstore be_none uxnogtk +testbn : [UT] testbn sshbn misc version conf tree234 uxmisc uxnogtk +testbn : [C] testbn sshbn misc version conf tree234 winmisc LIBS + +# ---------------------------------------------------------------------- +# On Windows, provide a means of removing local test binaries that we +# aren't going to actually ship. (I prefer this to not building them +# in the first place, so that we find out about build breakage early.) +!begin vc +cleantestprogs: + -del $(BUILDDIR)testbn.exe +!end +!begin clangcl +cleantestprogs: + -rm -f $(BUILDDIR)testbn.exe +!end