database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-11 20:28:21 +03:00
Code Activity

Unify searchpath and do file logic in MSVC build scripts.

Browse Source 
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.
This commit is contained in:
Andrew Dunstan
2019-02-06 07:32:35 -05:00
parent 2689e8e334
commit 13e95662c0
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/tools/msvc/build.pl
View File

@ -2,19 +2,18 @@
# src/tools/msvc/build.pl # src/tools/msvc/build.pl
BEGIN use File::Basename;
{ use File::Spec;
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
chdir("../../..") if (-d "../msvc" && -d "../../../src");
}
use lib "src/tools/msvc";
use Cwd; use Cwd;
use Mkvcbuild; 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 # buildenv.pl is for specifying the build environment settings
# it should contain lines like: # it should contain lines like:
# $ENV{PATH} = "c:/path/to/bison/bin;$ENV{PATH}"; # $ENV{PATH} = "c:/path/to/bison/bin;$ENV{PATH}";
@ -30,8 +29,8 @@ elsif (-e "./buildenv.pl")
# set up the project # set up the project
our $config; our $config;
do "./config_default.pl"; do "./src/tools/msvc/config_default.pl";
do "./config.pl" if (-f "src/tools/msvc/config.pl"); do "./src/tools/msvc/config.pl" if (-f "src/tools/msvc/config.pl");
my $vcver = Mkvcbuild::mkvcbuild($config); my $vcver = Mkvcbuild::mkvcbuild($config);