Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit38251d0

Browse files
committed
Fixed build under Win32 with new version defines. Disabled build of pg_arman for Win32.
Man page for pg_arman is generated during make dist now.
1 parentd4b8539 commit38251d0

File tree

6 files changed

+10
-2
lines changed

6 files changed

+10
-2
lines changed

‎GNUmakefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ distdir:
107107
done
108108
$(MAKE) -C $(distdir) distprep
109109
$(MAKE) -C $(distdir)/doc/src/sgml/ INSTALL
110+
$(MAKE) -C $(distdir)/contrib/pg_arman/doc pg_arman.1 XMLTO=/usr/bin/xmlto ASCIIDOC=/usr/bin/asciidoc
110111
cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
111112
$(MAKE) -C $(distdir) distclean
112113
rm -f $(distdir)/README.git

‎src/include/pg_config.h.win32

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,9 @@
596596
/* A string containing the version number, platform, and C compiler */
597597
#define PG_VERSION_STR "Uninitialized version string (win32)"
598598

599+
/* A string containing the PostgresPro version number, platform, and C compiler */
600+
#define PGPRO_VERSION_STR "Uninitialized version string (win32)"
601+
599602
/* The size of `long', as computed by sizeof. */
600603
#define SIZEOF_LONG 4
601604

‎src/tools/msvc/Install.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@ sub CopyContribFiles
464464
nextif ($deq"hstore_plpython" && !defined($config->{python}));
465465
nextif ($deq"ltree_plpython" && !defined($config->{python}));
466466
nextif ($deq"sepgsql");
467+
nextif ($deq'pg_arman');
467468

468469
CopySubdirFiles($subdir,$d,$config,$target);
469470
}

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ my $contrib_extrasource = {
4646

4747
my@contrib_excludes = (
4848
'commit_ts','hstore_plperl','hstore_plpython','intagg',
49-
'ltree_plpython','pgcrypto','sepgsql','brin');
49+
'ltree_plpython','pgcrypto','sepgsql','brin',
50+
'pg_arman');
5051

5152
# Set of variables for frontend modules
5253
my$frontend_defines = {'initdb'=>'FRONTEND' };

‎src/tools/msvc/Solution.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ sub GenerateFiles
162162
{
163163
s{PG_VERSION "[^"]+"}{PG_VERSION "$self->{strver}$extraver"};
164164
s{PG_VERSION_NUM\d+}{PG_VERSION_NUM$self->{numver}};
165-
s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY(z)\n#define PG_VERSION_STR "PostgreSQL$self->{strver}$extraver, compiled by Visual C++ build " __STRINGIFY2(_MSC_VER) ",$bits-bit"};
165+
s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY(z)\n#define PG_VERSION_STR "PostgreSQL$self->{strver}$extraver, compiled by Visual C++ build " __STRINGIFY2(_MSC_VER) ",$bits-bit"};
166+
s{#define PGPRO_VERSION_STR "[^"]+"}{#define PGPRO_VERSION_STR PGPRO_PACKAGE_STR " compiled by Visual C++ build" __STRINGIFY2(_MSC_VER) ",$bits-bit"};
166167
print O;
167168
}
168169
print O"#define PG_MAJORVERSION\"$self->{majorver}\"\n";

‎src/tools/msvc/vcregress.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ sub contribcheck
371371
nextif ($moduleeq"hstore_plpython" && !defined($config->{python}));
372372
nextif ($moduleeq"ltree_plpython" && !defined($config->{python}));
373373
nextif ($moduleeq"sepgsql");
374+
nextif ($moduleeq"pg_arman");
374375
# Need database with UTF8 encoding, not SQL_ASCII
375376
nextif ($moduleeq"hunspell_ru_ru");
376377

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp