1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00

Add support for generating MPW Makefiles. This makes the following changes:

* splitline gets support for changing the continuation character.
* deps returns a data structure for the output routine to format as
  appropriate.
* There's a new program type, [M], for Macintosh.
* There's a new backend to output mac/Makefile.mpw.

[originally from svn r2272]
This commit is contained in:
Ben Harris 2002-12-02 21:01:11 +00:00
parent 12081087e7
commit 26fcf5f991

View File

@ -57,7 +57,7 @@ while (<IN>) {
$i = shift @objs;
if ($groups{$i}) {
foreach $j (@{$groups{$i}}) { unshift @objs, $j; }
} elsif (($i eq "[G]" or $i eq "[C]" or
} 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 {
@ -198,12 +198,13 @@ sub objects {
}
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;
}
@ -211,9 +212,11 @@ sub splitline {
}
sub deps {
my ($otmpl, $rtmpl, $prefix, $dirsep) = @_;
my ($otmpl, $rtmpl, $prefix, $dirsep, $depchar, $splitchar) = @_;
my ($i, $x, $y);
my @deps;
my @deps, @ret;
@ret = ();
$depchar ||= ':';
foreach $i (sort keys %depends) {
if ($i =~ /^(.*)\.res/) {
next if !defined $rtmpl;
@ -228,8 +231,9 @@ sub deps {
s/\//$dirsep/g;
$_ = $prefix . $_;
} @deps;
print &splitline(sprintf "%s: %s", $x, join " ", @deps), "\n";
push @ret, {obj => $x, deps => [@deps]};
}
return @ret;
}
sub prognames {
@ -312,7 +316,10 @@ foreach $p (&prognames("GC")) {
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".
@ -403,7 +410,10 @@ foreach $p (&prognames("GC")) {
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".
@ -472,7 +482,10 @@ foreach $p (&prognames("GC")) {
}
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".
@ -540,7 +553,10 @@ foreach $p (&prognames("XU")) {
print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " .
$objstr . " $libstr", 69), "\n\n";
}
&deps("X.o", undef, "../", "/");
foreach $d (&deps("X.o", undef, "../", "/")) {
print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
"\n";
}
print
"\n".
"version.o: FORCE;\n".
@ -558,3 +574,79 @@ map("\t\$(INSTALL_DATA) -m 644 $_ \$(man1dir)/$_\n", &manpages("XU", "1")),
"\t\$(MAKE) install INSTALL_PROGRAM=\"\$(INSTALL_PROGRAM) -s\"\n",
"\n";
select STDOUT; close OUT;
##-- MPW Makefile
open OUT, ">mac/Makefile.mpw"; select OUT;
print <<END;
# Makefile for PuTTY under MPW.
#
# This file was created by `mkfiles.pl' from the `Recipe' file.
# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
END
# MPW command line option is -d not /D
($_ = $help) =~ s/=\/D/=-d /gs;
print $_;
print <<END;
COptions = -i : -i ::
COptions_68K = {COptions} -proto strict -model far
# disable "unused parameter" warnings
COptions_PPC = {COptions} -w 35
ILinkOptions = -t 'APPL' -c 'pTTY' -br 68k -model far
Libs_68K = "{CLibraries}StdCLib.o" \xb6
"{Libraries}MacRuntime.o" \xb6
"{Libraries}MathLib.far.o" \xb6
"{Libraries}IntEnv.o" \xb6
"{Libraries}Interface.o" \xb6
"{Libraries}OpenTransport.o" \xb6
"{Libraries}OpenTransportApp.o" \xb6
"{Libraries}OpenTptInet.o"
Libs_PPC = "{SharedLibraries}InterfaceLib" \xb6
"{SharedLibraries}StdCLib" \xb6
"{SharedLibraries}MathLib" \xb6
"{SharedLibraries}AppearanceLib" \xb6
-weaklib AppearanceLib \xb6
"{SharedLibraries}OpenTransportLib" \xb6
-weaklib OTGlobalLib \xb6
-weaklib OTUtilityLib \xb6
-weaklib OTClientUtilLib \xb6
-weaklib OTClientLib \xb6
-weaklib OTStreamUnixLib \xb6
-weaklib OTXTILib \xb6
-weaklib OTConfigLib \xb6
-weaklib OTNtvUtilLib \xb6
-weaklib OTNativeClientLib \xb6
"{SharedLibraries}OpenTptInternetLib" \xb6
-weaklib OTInetClientLib \xb6
"{PPCLibraries}StdCRuntime.o" \xb6
"{PPCLibraries}PPCCRuntime.o" \xb6
"{PPCLibraries}OpenTransportAppPPC.o" \xb6
"{PPCLibraries}OpenTptInetPPC.o"
END
print &splitline("all \xc4 " . join(" ", &progrealnames("M")), undef, "\xb6");
print "\n\n";
foreach $p (&prognames("M")) {
($prog, $type) = split ",", $p;
$objstr = &objects($p, "X.c.o", undef, undef);
print &splitline($prog . " \xc4 " . $objstr, undef, "\xb6"), "\n";
print &splitline("\tILink -o {Targ} {ILinkOptions} " .
$objstr . " {Libs_68K}", 69, "\xb6"), "\n\n";
}
foreach $d (&deps("X.c.o", undef, "::", ":")) {
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.c.x", undef, "::", ":")) {
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;