git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm

index 8f3cc173c5b72d36c06cee754d48f3fc86ccbb05..33290993addb5e83701badc0d4030a697f945aa9 100644 (file)

--- a/src/tools/msvc/Install.pm

+++ b/src/tools/msvc/Install.pm

next if ($d eq "sslinfo" && !defined($config->{openssl}));

next if ($d eq "xml2" && !defined($config->{xml}));

next if ($d eq "hstore_plperl" && !defined($config->{perl}));

+ next if ($d eq "jsonb_plperl" && !defined($config->{perl}));

next if ($d eq "hstore_plpython" && !defined($config->{python}));

next if ($d eq "jsonb_plpython" && !defined($config->{python}));

next if ($d eq "ltree_plpython" && !defined($config->{python}));

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm

index f3ec75f874e82e9e6140984d0342136c98b36a6c..71f72b16fc61e5b922c1e5d1d4c81bd0b2de09af 100644 (file)

--- a/src/tools/msvc/Mkvcbuild.pm

+++ b/src/tools/msvc/Mkvcbuild.pm

my @contrib_excludes = (

'commit_ts', 'hstore_plperl',

'hstore_plpython', 'intagg',

- 'jsonb_plpython',

+ 'jsonb_plperl', 'jsonb_plpython',

'ltree_plpython', 'pgcrypto',

'sepgsql', 'brin',

'test_extensions', 'test_pg_dump',

}

}

- # Add transform module dependent on plperl

+ # Add transform modules dependent on plperl

my $hstore_plperl = AddTransformModule(

'hstore_plperl', 'contrib/hstore_plperl',

'plperl', 'src/pl/plperl',

'hstore', 'contrib/hstore');

+ my $jsonb_plperl = AddTransformModule(

+ 'jsonb_plperl', 'contrib/jsonb_plperl',

+ 'plperl', 'src/pl/plperl');

foreach my $f (@perl_embed_ccflags)

{

$hstore_plperl->AddDefine($f);

+ $jsonb_plperl->AddDefine($f);

}

}

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl

index bac218c016c6d7fb365f52f0f8f12578c45257e0..2d6b67cedfb05b39fb2e9d59dc58b38f3135dc7f 100644 (file)

--- a/src/tools/msvc/vcregress.pl

+++ b/src/tools/msvc/vcregress.pl

next if ($module eq "sslinfo" && !defined($config->{openssl}));

next if ($module eq "xml2" && !defined($config->{xml}));

next if ($module eq "hstore_plperl" && !defined($config->{perl}));

+ next if ($module eq "jsonb_plperl" && !defined($config->{perl}));

next if ($module eq "hstore_plpython" && !defined($config->{python}));

next if ($module eq "jsonb_plpython" && !defined($config->{python}));

next if ($module eq "ltree_plpython" && !defined($config->{python}));