From 390bf1719e311510ccb1523a89fc238b620350bf Mon Sep 17 00:00:00 2001 From: Max Maischein Date: Sat, 11 Dec 2010 15:21:11 +0100 Subject: [PATCH] Windows compatibility fixes for running expand-macro.pl: a) Close filehandle to try.i so we can erase it b) The build process wants to be run from bleadperl/Win32 --- Porting/expand-macro.pl | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Porting/expand-macro.pl b/Porting/expand-macro.pl index 772bff6..6b33f74 100755 --- a/Porting/expand-macro.pl +++ b/Porting/expand-macro.pl @@ -51,6 +51,13 @@ while (<>) { } die "$macro not found\n" unless defined $header; +if ($^O =~ /MSWin(32|64)/) { + # The Win32 (and Win64) build process expects to be run from + # bleadperl/Win32 + chdir "Win32" + or die "Couldn't chdir to win32: $!"; +}; + open my $out, '>', $trysource or die "Can't open $trysource: $!"; my $sentinel = "$macro expands to"; @@ -107,15 +114,17 @@ if ($opt{f} || $opt{F}) { $out_fh = \*STDOUT; } -open my $fh, '<', $tryout or die "Can't open $tryout: $!"; +{ + open my $fh, '<', $tryout or die "Can't open $tryout: $!"; -while (<$fh>) { - print $out_fh $_ if /$sentinel/o .. 1; -} + while (<$fh>) { + print $out_fh $_ if /$sentinel/o .. 1; + } +}; unless ($opt{k}) { foreach($trysource, $tryout) { - die "Can't unlink $_" unless unlink $_; + die "Can't unlink $_: $!" unless unlink $_; } } -- 2.7.4