diff options
| author | Noah Misch <noah@leadboat.com> | 2014-07-14 14:07:27 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2014-07-14 14:07:27 -0400 |
| commit | 35d19a9a37c245ff7c640743f37b8df227fd24dc (patch) | |
| tree | 1c6583feb9340b8b2ad75ebbbf2cf915b6793f6f /src/tools/msvc/Install.pm | |
| parent | 91f03ba5cf88b393bf2509f3f00dd00437a5bd54 (diff) | |
| download | postgresql-35d19a9a37c245ff7c640743f37b8df227fd24dc.tar.gz postgresql-35d19a9a37c245ff7c640743f37b8df227fd24dc.zip | |
MSVC: Process Makefile line continuations more like "make" does.
Unlike "make" itself, the MSVC build process recognized a continuation
even with whitespace after the backslash. (Due to a typo, some code
sites accepted the letter "s" instead of whitespace). Also, it would
consume any number of newlines following a single backslash. This is
mere cleanup; those behaviors were unlikely to cause bugs.
Diffstat (limited to 'src/tools/msvc/Install.pm')
| -rw-r--r-- | src/tools/msvc/Install.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index ce17f72ec5a..eba9aa08f1b 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -307,7 +307,7 @@ sub GenerateConversionScript print "Generating conversion proc script..."; my $mf = read_file('src/backend/utils/mb/conversion_procs/Makefile'); - $mf =~ s{\\\s*[\r\n]+}{}mg; + $mf =~ s{\\\r?\n}{}g; $mf =~ /^CONVERSIONS\s*=\s*(.*)$/m || die "Could not find CONVERSIONS line in conversions Makefile\n"; my @pieces = split /\s+/, $1; @@ -341,7 +341,7 @@ sub GenerateTimezoneFiles my $target = shift; my $conf = shift; my $mf = read_file("src/timezone/Makefile"); - $mf =~ s{\\\s*[\r\n]+}{}mg; + $mf =~ s{\\\r?\n}{}g; $mf =~ /^TZDATA\s*:?=\s*(.*)$/m || die "Could not find TZDATA row in timezone makefile\n"; my @tzfiles = split /\s+/, $1; @@ -360,7 +360,7 @@ sub GenerateTsearchFiles my $F; my $tmpl = read_file('src/backend/snowball/snowball.sql.in'); my $mf = read_file('src/backend/snowball/Makefile'); - $mf =~ s{\\\s*[\r\n]+}{}mg; + $mf =~ s{\\\r?\n}{}g; $mf =~ /^LANGUAGES\s*=\s*(.*)$/m || die "Could not find LANGUAGES line in snowball Makefile\n"; my @pieces = split /\s+/, $1; @@ -415,7 +415,7 @@ sub CopyContribFiles next if ($d eq "sepgsql"); my $mf = read_file("contrib/$d/Makefile"); - $mf =~ s{\\s*[\r\n]+}{}mg; + $mf =~ s{\\\r?\n}{}g; # Note: we currently don't support setting MODULEDIR in the makefile my $moduledir = 'contrib'; @@ -587,7 +587,7 @@ qq{xcopy /s /i /q /r /y src\\include\\$d\\*.h "$ctarget\\include\\server\\$d\\"} closedir($D); my $mf = read_file('src/interfaces/ecpg/include/Makefile'); - $mf =~ s{\\s*[\r\n]+}{}mg; + $mf =~ s{\\\r?\n}{}g; $mf =~ /^ecpg_headers\s*=\s*(.*)$/m || croak "Could not find ecpg_headers line\n"; CopyFiles( |