Attempt to fix jsonb_plperl build on Windows

petere · petere · commit 4ab299981576 · 2018-04-03T10:43:41.000-04:00
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
@@ -464,6 +464,7 @@ sub CopyContribFiles
 			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
@@ -43,7 +43,7 @@ my $contrib_extrasource = {
 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',
@@ -746,15 +746,19 @@ sub mkvcbuild
 			}
 		}
 
-		# 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
@@ -376,6 +376,7 @@ sub contribcheck
 		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}));

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ my $contrib_extrasource = {`
`43`	`43`	`my @contrib_excludes = (`
`44`	`44`	`'commit_ts', 'hstore_plperl',`
`45`	`45`	`'hstore_plpython', 'intagg',`
`46`		`- 'jsonb_plpython',`
	`46`	`+ 'jsonb_plperl', 'jsonb_plpython',`
`47`	`47`	`'ltree_plpython', 'pgcrypto',`
`48`	`48`	`'sepgsql', 'brin',`
`49`	`49`	`'test_extensions', 'test_pg_dump',`
`@@ -746,15 +746,19 @@ sub mkvcbuild`
`746`	`746`	`}`
`747`	`747`	`}`
`748`	`748`
`749`		`- # Add transform module dependent on plperl`
	`749`	`+ # Add transform modules dependent on plperl`
`750`	`750`	`my $hstore_plperl = AddTransformModule(`
`751`	`751`	`'hstore_plperl', 'contrib/hstore_plperl',`
`752`	`752`	`'plperl', 'src/pl/plperl',`
`753`	`753`	`'hstore', 'contrib/hstore');`
	`754`	`+ my $jsonb_plperl = AddTransformModule(`
	`755`	`+ 'jsonb_plperl', 'contrib/jsonb_plperl',`
	`756`	`+ 'plperl', 'src/pl/plperl');`
`754`	`757`
`755`	`758`	`foreach my $f (@perl_embed_ccflags)`
`756`	`759`	`{`
`757`	`760`	`$hstore_plperl->AddDefine($f);`
	`761`	`+ $jsonb_plperl->AddDefine($f);`
`758`	`762`	`}`
`759`	`763`	`}`
`760`	`764`