Skip to content

Commit 8ec3a08

Browse files
committed
Added project configuration files for MSVC 2010 32/64bit.
1 parent 232c9bb commit 8ec3a08

File tree

8 files changed

+814
-12
lines changed

8 files changed

+814
-12
lines changed

bin/pgut/pgut-fe.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,9 +626,14 @@ pgut_getopt(int argc, char **argv, pgut_option options[])
626626
}
627627
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
628628
{
629-
fprintf(stderr, "%s %s\n", PROGRAM_NAME, PROGRAM_VERSION);
629+
printf("%s %s\n", PROGRAM_NAME, PROGRAM_VERSION);
630630
exit(1);
631631
}
632+
if (strcmp(argv[1], "--configuration") == 0)
633+
{
634+
printf("%s\n", PG_VERSION_STR);
635+
exit(0);
636+
}
632637
}
633638

634639
/* Merge default and user options. */

lib/pg_reorg.sql.in

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,17 @@ LANGUAGE sql STABLE STRICT;
108108

109109
-- includes not only PRIMARY KEYS but also UNIQUE NOT NULL keys
110110
CREATE VIEW reorg.primary_keys AS
111-
SELECT indrelid, (reorg.array_accum(indexrelid))[1] AS indexrelid
112-
FROM (SELECT indrelid, indexrelid FROM pg_index
113-
WHERE indisunique
114-
AND 0 <> ALL(indkey)
115-
AND NOT EXISTS(
116-
SELECT 1 FROM pg_attribute
117-
WHERE attrelid = indrelid
118-
AND attnum = ANY(indkey)
119-
AND NOT attnotnull)
120-
ORDER BY indrelid, indisprimary DESC, indnatts, indkey) tmp
121-
GROUP BY indrelid;
111+
SELECT indrelid, (reorg.array_accum(indexrelid))[1] AS indexrelid
112+
FROM (SELECT indrelid, indexrelid FROM pg_index
113+
WHERE indisunique
114+
AND 0 <> ALL(indkey)
115+
AND NOT EXISTS(
116+
SELECT 1 FROM pg_attribute
117+
WHERE attrelid = indrelid
118+
AND attnum = ANY(indkey)
119+
AND NOT attnotnull)
120+
ORDER BY indrelid, indisprimary DESC, indnatts, indkey) tmp
121+
GROUP BY indrelid;
122122

123123
CREATE VIEW reorg.tables AS
124124
SELECT R.oid::regclass AS relname,

lib/reorg.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,6 +1181,7 @@ swap_heap_or_index_files(Oid r1, Oid r2)
11811181

11821182
#if PG_VERSION_NUM < 80400
11831183

1184+
/* XXX: You might need to add PGDLLIMPORT into your miscadmin.h. */
11841185
extern PGDLLIMPORT bool allowSystemTableMods;
11851186

11861187
static void

msvc/bin.2010.vcxproj

Lines changed: 334 additions & 0 deletions
Large diffs are not rendered by default.

msvc/bin.2010.vcxproj.filters

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="src">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="include">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="regress">
13+
<UniqueIdentifier>{5f942836-8862-4aa3-8573-a6b80a4fbe4f}</UniqueIdentifier>
14+
</Filter>
15+
<Filter Include="regress\sql">
16+
<UniqueIdentifier>{e0adaf77-900d-4307-9a5f-6be049d0d93b}</UniqueIdentifier>
17+
</Filter>
18+
<Filter Include="regress\expected">
19+
<UniqueIdentifier>{5cf8792b-6351-4f2c-88db-784d7d8a425c}</UniqueIdentifier>
20+
</Filter>
21+
<Filter Include="doc">
22+
<UniqueIdentifier>{6a46f2b1-6c15-44c2-bf14-500562f0fc30}</UniqueIdentifier>
23+
</Filter>
24+
</ItemGroup>
25+
<ItemGroup>
26+
<None Include="readme.txt">
27+
<Filter>doc</Filter>
28+
</None>
29+
<None Include="..\doc\index.html">
30+
<Filter>doc</Filter>
31+
</None>
32+
<None Include="..\doc\index-ja.html">
33+
<Filter>doc</Filter>
34+
</None>
35+
<None Include="..\doc\pg_reorg.html">
36+
<Filter>doc</Filter>
37+
</None>
38+
<None Include="..\doc\pg_reorg-ja.html">
39+
<Filter>doc</Filter>
40+
</None>
41+
<None Include="..\doc\style.css">
42+
<Filter>doc</Filter>
43+
</None>
44+
<None Include="..\bin\Makefile" />
45+
<None Include="..\bin\expected\init.out">
46+
<Filter>regress\expected</Filter>
47+
</None>
48+
<None Include="..\bin\expected\reorg.out">
49+
<Filter>regress\expected</Filter>
50+
</None>
51+
<None Include="..\bin\sql\init.sql">
52+
<Filter>regress\sql</Filter>
53+
</None>
54+
<None Include="..\bin\sql\reorg.sql">
55+
<Filter>regress\sql</Filter>
56+
</None>
57+
</ItemGroup>
58+
<ItemGroup>
59+
<ClCompile Include="..\bin\pg_reorg.c">
60+
<Filter>src</Filter>
61+
</ClCompile>
62+
<ClCompile Include="..\bin\pgut\pgut.c">
63+
<Filter>src</Filter>
64+
</ClCompile>
65+
<ClCompile Include="..\bin\pgut\pgut-fe.c">
66+
<Filter>src</Filter>
67+
</ClCompile>
68+
</ItemGroup>
69+
<ItemGroup>
70+
<ClInclude Include="..\bin\pgut\pgut.h">
71+
<Filter>include</Filter>
72+
</ClInclude>
73+
<ClInclude Include="..\bin\pgut\pgut-fe.h">
74+
<Filter>include</Filter>
75+
</ClInclude>
76+
</ItemGroup>
77+
</Project>

msvc/lib.2010.vcxproj

Lines changed: 302 additions & 0 deletions
Large diffs are not rendered by default.

msvc/lib.2010.vcxproj.filters

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="src">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="include">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+
</Filter>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<None Include="..\lib\Makefile" />
15+
<None Include="..\lib\pg_reorg.sql.in" />
16+
<None Include="..\lib\uninstall_pg_reorg.sql" />
17+
</ItemGroup>
18+
<ItemGroup>
19+
<ClCompile Include="..\lib\reorg.c">
20+
<Filter>src</Filter>
21+
</ClCompile>
22+
<ClCompile Include="..\lib\pgut\pgut-spi.c">
23+
<Filter>src</Filter>
24+
</ClCompile>
25+
<ClCompile Include="..\lib\pgut\pgut-be.c">
26+
<Filter>src</Filter>
27+
</ClCompile>
28+
</ItemGroup>
29+
<ItemGroup>
30+
<ClInclude Include="..\lib\pgut\pgut-spi.h">
31+
<Filter>include</Filter>
32+
</ClInclude>
33+
<ClInclude Include="..\lib\pgut\pgut-be.h">
34+
<Filter>include</Filter>
35+
</ClInclude>
36+
</ItemGroup>
37+
</Project>

msvc/pg_reorg.2010.sln

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual C++ Express 2010
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin.2010", "bin.2010.vcxproj", "{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}"
5+
EndProject
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib.2010", "lib.2010.vcxproj", "{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
8.3|Win32 = 8.3|Win32
11+
8.3|x64 = 8.3|x64
12+
8.4|Win32 = 8.4|Win32
13+
8.4|x64 = 8.4|x64
14+
9.0|Win32 = 9.0|Win32
15+
9.0|x64 = 9.0|x64
16+
EndGlobalSection
17+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18+
{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}.8.3|Win32.ActiveCfg = 8.3|Win32
19+
{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}.8.3|Win32.Build.0 = 8.3|Win32
20+
{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}.8.3|x64.ActiveCfg = 8.3|x64
21+
{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}.8.3|x64.Build.0 = 8.3|x64
22+
{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}.8.4|Win32.ActiveCfg = 8.4|Win32
23+
{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}.8.4|Win32.Build.0 = 8.4|Win32
24+
{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}.8.4|x64.ActiveCfg = 8.4|x64
25+
{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}.8.4|x64.Build.0 = 8.4|x64
26+
{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}.9.0|Win32.ActiveCfg = 9.0|Win32
27+
{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}.9.0|Win32.Build.0 = 9.0|Win32
28+
{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}.9.0|x64.ActiveCfg = 9.0|x64
29+
{B6B37F22-9E44-4240-AAA0-650D4AC2C1E2}.9.0|x64.Build.0 = 9.0|x64
30+
{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}.8.3|Win32.ActiveCfg = 8.3|Win32
31+
{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}.8.3|Win32.Build.0 = 8.3|Win32
32+
{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}.8.3|x64.ActiveCfg = 8.3|x64
33+
{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}.8.3|x64.Build.0 = 8.3|x64
34+
{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}.8.4|Win32.ActiveCfg = 8.4|Win32
35+
{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}.8.4|Win32.Build.0 = 8.4|Win32
36+
{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}.8.4|x64.ActiveCfg = 8.4|x64
37+
{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}.8.4|x64.Build.0 = 8.4|x64
38+
{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}.9.0|Win32.ActiveCfg = 9.0|Win32
39+
{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}.9.0|Win32.Build.0 = 9.0|Win32
40+
{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}.9.0|x64.ActiveCfg = 9.0|x64
41+
{B6B37F22-9E44-4240-AAA0-650D4AC2C2E2}.9.0|x64.Build.0 = 9.0|x64
42+
EndGlobalSection
43+
GlobalSection(SolutionProperties) = preSolution
44+
HideSolutionNode = FALSE
45+
EndGlobalSection
46+
EndGlobal

0 commit comments

Comments
 (0)