X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/8aa5bfd9eda518021517a5c51d2847f1057b7ed7..2dc6356a02ebe2e5c0428cefc18e64882d85b4a6:/mkfiles.pl diff --git a/mkfiles.pl b/mkfiles.pl index 492a59d6..384a88e6 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -7,11 +7,19 @@ # files to compute #include dependencies. Finally, writes out the # various target Makefiles. +use FileHandle; + open IN, "Recipe" or die "unable to open Recipe file\n"; +# HACK: One of the source files in `charset' is auto-generated by +# sbcsgen.pl. We need to generate that _now_, before attempting +# dependency analysis. +eval 'chdir "charset"; require "sbcsgen.pl"; chdir ".."'; + +@incdirs = ("", "charset/", "unix/", "mac/"); + $help = ""; # list of newline-free lines of help text -%programs = (); # maps program name to listref of objects/resources -%types = (); # maps program name to "G" or "C" +%programs = (); # maps prog name + type letter to listref of objects/resources %groups = (); # maps group name to listref of objects/resources while () { @@ -42,8 +50,7 @@ while () { $prog = undef; shift @objs; # eat the group name } elsif ($_[1] eq ":") { - $programs{$_[0]} = [] if !defined $programs{$_[0]}; - $listref = $programs{$_[0]}; + $listref = []; $prog = $_[0]; shift @objs; # eat the program name } else { @@ -55,12 +62,18 @@ while () { $i = shift @objs; if ($groups{$i}) { foreach $j (@{$groups{$i}}) { unshift @objs, $j; } - } elsif (($i eq "[G]" or $i eq "[C]") and defined $prog) { - $types{$prog} = substr($i,1,1); + } elsif (($i eq "[G]" or $i eq "[C]" or $i eq "[M]" or + $i eq "[X]" or $i eq "[U]") and defined $prog) { + $type = substr($i,1,1); } else { push @$listref, $i; } } + if ($prog and $type) { + die "multiple program entries for $prog [$type]\n" + if defined $programs{$prog . "," . $type}; + $programs{$prog . "," . $type} = $listref; + } $lastlistref = $listref; } @@ -73,7 +86,7 @@ close IN; %depends = (); @scanlist = (); foreach $i (@prognames) { - if (!defined $types{$i}) { die "type not set for program $i\n"; } + ($prog, $type) = split ",", $i; # Strip duplicate object names. $prev = undef; @list = grep { $status = ($prev ne $_); $prev=$_; $status } @@ -82,12 +95,17 @@ foreach $i (@prognames) { foreach $j (@list) { # Dependencies for "x" start with "x.c". # Dependencies for "x.res" start with "x.rc". + # Dependencies for "x.rsrc" start with "x.r". # Both types of file are pushed on the list of files to scan. # Libraries (.lib) don't have dependencies at all. if ($j =~ /^(.*)\.res$/) { $file = "$1.rc"; $depends{$j} = [$file]; push @scanlist, $file; + } elsif ($j =~ /^(.*)\.rsrc$/) { + $file = "$1.r"; + $depends{$j} = [$file]; + push @scanlist, $file; } elsif ($j =~ /\.lib$/) { # libraries don't have dependencies } else { @@ -118,7 +136,8 @@ while (scalar @scanlist > 0) { next if defined $further{$file}; # skip if we've already done it $resource = ($file =~ /\.rc$/ ? 1 : 0); $further{$file} = []; - open IN, $file or die "unable to open source file $file\n"; + $dirfile = &findfile($file); + open IN, "$dirfile" or die "unable to open source file $file\n"; while () { chomp; /^\s*#include\s+\"([^\"]+)\"/ and do { @@ -156,35 +175,46 @@ foreach $i (keys %depends) { # Utility routines while writing out the Makefiles. +sub findfile { + my ($name) = @_; + my $dir, $i, $outdir = ""; + $i = 0; + foreach $dir (@incdirs) { + $outdir = $dir, $i++ if -f "$dir$name"; + } + die "multiple instances of source file $name\n" if $i > 1; + return "$outdir$name"; +} + sub objects { - my ($prog, $otmpl, $rtmpl, $ltmpl) = @_; + my ($prog, $otmpl, $rtmpl, $ltmpl, $prefix, $dirsep) = @_; my @ret; my ($i, $x, $y); @ret = (); foreach $i (@{$programs{$prog}}) { - if ($i =~ /^(.*)\.res/) { + $x = ""; + if ($i =~ /^(.*)\.(res|rsrc)/) { $y = $1; ($x = $rtmpl) =~ s/X/$y/; - push @ret, $x if $x ne ""; } elsif ($i =~ /^(.*)\.lib/) { $y = $1; ($x = $ltmpl) =~ s/X/$y/; - push @ret, $x if $x ne ""; } else { ($x = $otmpl) =~ s/X/$i/; - push @ret, $x if $x ne ""; } + push @ret, $x if $x ne ""; } return join " ", @ret; } sub splitline { - my ($line, $width) = @_; + my ($line, $width, $splitchar) = @_; my ($result, $len); $len = (defined $width ? $width : 76); + $splitchar = (defined $splitchar ? $splitchar : '\\'); while (length $line > $len) { $line =~ /^(.{0,$len})\s(.*)$/ or $line =~ /^(.{$len,}?\s(.*)$/; - $result .= $1 . " \\\n\t\t"; + $result .= $1 . " ${splitchar}\n\t\t"; $line = $2; $len = 60; } @@ -192,17 +222,62 @@ sub splitline { } sub deps { - my ($otmpl, $rtmpl) = @_; + my ($otmpl, $rtmpl, $prefix, $dirsep, $depchar, $splitchar) = @_; my ($i, $x, $y); + my @deps, @ret; + @ret = (); + $depchar ||= ':'; foreach $i (sort keys %depends) { - if ($i =~ /^(.*)\.res/) { + if ($i =~ /^(.*)\.(res|rsrc)/) { + next if !defined $rtmpl; $y = $1; ($x = $rtmpl) =~ s/X/$y/; } else { ($x = $otmpl) =~ s/X/$i/; } - print &splitline(sprintf "%s: %s", $x, join " ", @{$depends{$i}}), "\n"; + @deps = @{$depends{$i}}; + @deps = map { + $_ = &findfile($_); + s/\//$dirsep/g; + $_ = $prefix . $_; + } @deps; + push @ret, {obj => $x, deps => [@deps]}; + } + return @ret; +} + +sub prognames { + my ($types) = @_; + my ($n, $prog, $type); + my @ret; + @ret = (); + foreach $n (@prognames) { + ($prog, $type) = split ",", $n; + push @ret, $n if index($types, $type) >= 0; + } + return @ret; +} + +sub progrealnames { + my ($types) = @_; + my ($n, $prog, $type); + my @ret; + @ret = (); + foreach $n (@prognames) { + ($prog, $type) = split ",", $n; + push @ret, $prog if index($types, $type) >= 0; } + return @ret; +} + +sub manpages { + my ($types,$suffix) = @_; + + # assume that all UNIX programs have a man page + if($suffix eq "1" && $types =~ /X/) { + return map("$_.1", &progrealnames($types)); + } + return (); } # Now we're ready to output the actual Makefiles. @@ -223,6 +298,9 @@ print "# TOOLPATH = /pkg/mingw32msvc/i386-mingw32msvc/bin/\n". "CC = \$(TOOLPATH)gcc\n". "RC = \$(TOOLPATH)windres\n". +"# Uncomment the following two lines to compile under Winelib\n". +"# CC = winegcc\n". +"# RC = wrc\n". "# You may also need to tell windres where to find include files:\n". "# RCINC = --include-dir c:\\cygwin\\include\\\n". "\n". @@ -240,17 +318,21 @@ print "%.res.o: %.rc\n". "\t\$(RC) \$(FWHACK) \$(RCFL) \$(RCFLAGS) \$< \$\@\n". "\n"; -print &splitline("all:" . join "", map { " $_.exe" } @prognames); +print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("GC")); print "\n\n"; -foreach $p (@prognames) { +foreach $p (&prognames("GC")) { + ($prog, $type) = split ",", $p; $objstr = &objects($p, "X.o", "X.res.o", undef); - print &splitline($p . ".exe: " . $objstr), "\n"; - my $mw = $types{$p} eq "G" ? " -mwindows" : ""; + print &splitline($prog . ".exe: " . $objstr), "\n"; + my $mw = $type eq "G" ? " -mwindows" : ""; $libstr = &objects($p, undef, undef, "-lX"); print &splitline("\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " . $objstr . " $libstr", 69), "\n\n"; } -&deps("X.o", "X.res.o"); +foreach $d (&deps("X.o", "X.res.o", "", "/")) { + print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})), + "\n"; +} print "\n". "version.o: FORCE;\n". @@ -290,7 +372,7 @@ print "MAKEFILE = Makefile.bor\n". "\n". "# C compilation flags\n". -"CFLAGS = -DWINVER=0x0401\n". +"CFLAGS = -D_WINDOWS -DWINVER=0x0401\n". "\n". "# Get include directory for resource compiler\n". "!if !\$d(BCB)\n". @@ -304,16 +386,18 @@ print &splitline("\tbrcc32 \$(FWHACK) \$(RCFL) -i \$(BCB)\\include -r". " -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0401 \$*.rc",69)."\n". "\n"; -print &splitline("all:" . join "", map { " $_.exe" } @prognames); +print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("GC")); print "\n\n"; -foreach $p (@prognames) { +foreach $p (&prognames("GC")) { + ($prog, $type) = split ",", $p; $objstr = &objects($p, "X.obj", "X.res", undef); - print &splitline("$p.exe: " . $objstr . " $p.rsp"), "\n"; - my $ap = ($types{$p} eq "G") ? "-aa" : "-ap"; - print "\tilink32 $ap -Gn -L\$(BCB)\\lib \@$p.rsp\n\n"; + print &splitline("$prog.exe: " . $objstr . " $prog.rsp"), "\n"; + my $ap = ($type eq "G") ? "-aa" : "-ap"; + print "\tilink32 $ap -Gn -L\$(BCB)\\lib \@$prog.rsp\n\n"; } -foreach $p (@prognames) { - print $p, ".rsp: \$(MAKEFILE)\n"; +foreach $p (&prognames("GC")) { + ($prog, $type) = split ",", $p; + print $prog, ".rsp: \$(MAKEFILE)\n"; $objstr = &objects($p, "X.obj", undef, undef); @objlist = split " ", $objstr; @objlines = (""); @@ -323,23 +407,26 @@ foreach $p (@prognames) { } $objlines[$#objlines] .= " $i"; } - $c0w = ($types{$p} eq "G") ? "c0w32" : "c0x32"; - print "\techo $c0w + > $p.rsp\n"; + $c0w = ($type eq "G") ? "c0w32" : "c0x32"; + print "\techo $c0w + > $prog.rsp\n"; for ($i=0; $i<=$#objlines; $i++) { $plus = ($i < $#objlines ? " +" : ""); - print "\techo$objlines[$i]$plus >> $p.rsp\n"; + print "\techo$objlines[$i]$plus >> $prog.rsp\n"; } - print "\techo $p.exe >> $p.rsp\n"; + print "\techo $prog.exe >> $prog.rsp\n"; $objstr = &objects($p, "X.obj", "X.res", undef); @libs = split " ", &objects($p, undef, undef, "X"); @libs = grep { !$stdlibs{$_} } @libs; unshift @libs, "cw32", "import32"; $libstr = join ' ', @libs; - print "\techo nul,$libstr, >> $p.rsp\n"; - print "\techo " . &objects($p, undef, "X.res", undef) . " >> $p.rsp\n"; + print "\techo nul,$libstr, >> $prog.rsp\n"; + print "\techo " . &objects($p, undef, "X.res", undef) . " >> $prog.rsp\n"; print "\n"; } -&deps("X.obj", "X.res"); +foreach $d (&deps("X.obj", "X.res", "", "\\")) { + print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})), + "\n"; +} print "\n". "version.o: FORCE\n". @@ -381,15 +468,17 @@ print ".rc.res:\n". "\trc \$(FWHACK) \$(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 \$*.rc\n". "\n"; -print &splitline("all:" . join "", map { " $_.exe" } @prognames); +print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("GC")); print "\n\n"; -foreach $p (@prognames) { +foreach $p (&prognames("GC")) { + ($prog, $type) = split ",", $p; $objstr = &objects($p, "X.obj", "X.res", undef); - print &splitline("$p.exe: " . $objstr . " $p.rsp"), "\n"; - print "\tlink \$(LFLAGS) -out:$p.exe -map:$p.map \@$p.rsp\n\n"; + print &splitline("$prog.exe: " . $objstr . " $prog.rsp"), "\n"; + print "\tlink \$(LFLAGS) -out:$prog.exe -map:$prog.map \@$prog.rsp\n\n"; } -foreach $p (@prognames) { - print $p, ".rsp: \$(MAKEFILE)\n"; +foreach $p (&prognames("GC")) { + ($prog, $type) = split ",", $p; + print $prog, ".rsp: \$(MAKEFILE)\n"; $objstr = &objects($p, "X.obj", "X.res", "X.lib"); @objlist = split " ", $objstr; @objlines = (""); @@ -399,14 +488,17 @@ foreach $p (@prognames) { } $objlines[$#objlines] .= " $i"; } - $subsys = ($types{$p} eq "G") ? "windows" : "console"; - print "\techo /nologo /subsystem:$subsys > $p.rsp\n"; + $subsys = ($type eq "G") ? "windows" : "console"; + print "\techo /nologo /subsystem:$subsys > $prog.rsp\n"; for ($i=0; $i<=$#objlines; $i++) { - print "\techo$objlines[$i] >> $p.rsp\n"; + print "\techo$objlines[$i] >> $prog.rsp\n"; } print "\n"; } -&deps("X.obj", "X.res"); +foreach $d (&deps("X.obj", "X.res", "", "\\")) { + print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})), + "\n"; +} print "\n". "# Hack to force version.o to be rebuilt always\n". @@ -431,3 +523,180 @@ print "\t-del *.idb\n". "\t-del debug.log\n"; select STDOUT; close OUT; + +##-- X/GTK/Unix makefile +open OUT, ">unix/Makefile.gtk"; select OUT; +print +"# Makefile for PuTTY under X/GTK and Unix.\n". +"#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n". +"# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n"; +# gcc command line option is -D not /D +($_ = $help) =~ s/=\/D/=-D/gs; +print $_; +print +"\n". +"# You can define this path to point at your tools if you need to\n". +"# TOOLPATH = /opt/gcc/bin\n". +"CC = \$(TOOLPATH)cc\n". +"\n". +&splitline("CFLAGS = -Wall -g -I. -I.. -I../charset `gtk-config --cflags`")."\n". +"XLDFLAGS = `gtk-config --libs`\n". +"ULDFLAGS =#\n". +"INSTALL=install\n", +"INSTALL_PROGRAM=\$(INSTALL)\n", +"INSTALL_DATA=\$(INSTALL)\n", +"prefix=/usr/local\n", +"exec_prefix=\$(prefix)\n", +"bindir=\$(exec_prefix)/bin\n", +"mandir=\$(prefix)/man\n", +"man1dir=\$(mandir)/man1\n", +"\n". +".SUFFIXES:\n". +"\n". +"%.o:\n". +"\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c \$<\n". +"\n"; +print &splitline("all:" . join "", map { " $_" } &progrealnames("XU")); +print "\n\n"; +foreach $p (&prognames("XU")) { + ($prog, $type) = split ",", $p; + $objstr = &objects($p, "X.o", undef, undef); + print &splitline($prog . ": " . $objstr), "\n"; + $libstr = &objects($p, undef, undef, "-lX"); + print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " . + $objstr . " $libstr", 69), "\n\n"; +} +foreach $d (&deps("X.o", undef, "../", "/")) { + print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})), + "\n"; +} +print +"\n". +"version.o: FORCE;\n". +"# Hack to force version.o to be rebuilt always\n". +"FORCE:\n". +"\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) \$(VER) -c ../version.c\n". +"clean:\n". +"\trm -f *.o". (join "", map { " $_" } &progrealnames("XU")) . "\n". +"\n", +"install:\n", +map("\t\$(INSTALL_PROGRAM) -m 755 $_ \$(bindir)/$_\n", &progrealnames("XU")), +map("\t\$(INSTALL_DATA) -m 644 $_ \$(man1dir)/$_\n", &manpages("XU", "1")), +"\n", +"install-strip:\n", +"\t\$(MAKE) install INSTALL_PROGRAM=\"\$(INSTALL_PROGRAM) -s\"\n", +"\n"; +select STDOUT; close OUT; + +##-- MPW Makefile +open OUT, ">mac/Makefile.mpw"; select OUT; +print <{obj}; + print &splitline(sprintf("%s \xc4 %s", $d->{obj}, join " ", @{$d->{deps}}), + undef, "\xb6"), "\n"; + print "\tRez ", $d->{deps}->[0], " -o {Targ} {ROptions}\n\n"; +} +foreach $d (&deps("X.68k.o", "", "::", ":")) { + next unless $d->{obj}; + print &splitline(sprintf("%s \xc4 %s", $d->{obj}, join " ", @{$d->{deps}}), + undef, "\xb6"), "\n"; + print "\t{C} ", $d->{deps}->[0], " -o {Targ} {COptions_68K}\n\n"; +} +foreach $d (&deps("X.cfm68k.o", "", "::", ":")) { + next unless $d->{obj}; + print &splitline(sprintf("%s \xc4 %s", $d->{obj}, join " ", @{$d->{deps}}), + undef, "\xb6"), "\n"; + print "\t{C} ", $d->{deps}->[0], " -o {Targ} {COptions_CFM68K}\n\n"; +} +foreach $d (&deps("X.ppc.o", "", "::", ":")) { + next unless $d->{obj}; + print &splitline(sprintf("%s \xc4 %s", $d->{obj}, join " ", @{$d->{deps}}), + undef, "\xb6"), "\n"; + # The odd stuff here seems to stop afpd getting confused. + print "\techo -n > {Targ}\n"; + print "\tsetfile -t XCOF {Targ}\n"; + print "\t{PPCC} ", $d->{deps}->[0], " -o {Targ} {COptions_PPC}\n\n"; +} +select STDOUT; close OUT;