From: Andrew Dunstan <andrew@dunslane.net>
Date: Wed, 6 Feb 2019 12:32:35 +0000 (-0500)
Subject: Unify searchpath and do file logic in MSVC build scripts.
X-Git-Tag: REL9_6_12~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=324c926468826c1ddc780806c35691a31523d83a;p=postgresql

Unify searchpath and do file logic in MSVC build scripts.

Commit f83419b739 failed to notice that mkvcbuild.pl and build.pl use
different searchpath and do-file logic, breaking the latter, so it is
adjusted to use the same logic as mkvcbuild.pl.
---

diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl
index 709d6a9a28..1f9c51f433 100644
--- a/src/tools/msvc/build.pl
+++ b/src/tools/msvc/build.pl
@@ -2,19 +2,18 @@
 
 # src/tools/msvc/build.pl
 
-BEGIN
-{
-
-	chdir("../../..") if (-d "../msvc" && -d "../../../src");
-
-}
-
-use lib "src/tools/msvc";
+use File::Basename;
+use File::Spec;
+BEGIN  { use lib File::Spec->rel2abs(dirname(__FILE__)); }
 
 use Cwd;
 
 use Mkvcbuild;
 
+chdir('..\..\..') if (-d '..\msvc' && -d '..\..\..\src');
+die 'Must run from root or msvc directory'
+  unless (-d 'src\tools\msvc' && -d 'src');
+
 # buildenv.pl is for specifying the build environment settings
 # it should contain lines like:
 # $ENV{PATH} = "c:/path/to/bison/bin;$ENV{PATH}";
@@ -30,8 +29,8 @@ elsif (-e "./buildenv.pl")
 
 # set up the project
 our $config;
-do "./config_default.pl";
-do "./config.pl" if (-f "src/tools/msvc/config.pl");
+do "./src/tools/msvc/config_default.pl";
+do "./src/tools/msvc/config.pl" if (-f "src/tools/msvc/config.pl");
 
 my $vcver = Mkvcbuild::mkvcbuild($config);