Skip to content

Commit 4ccc3a2

Browse files
rockeetrockeet
committed
vs2015: use wiredtiger-2.8.0 include and library
1 parent 963f4ca commit 4ccc3a2

8 files changed

Lines changed: 41 additions & 23 deletions

File tree

‎vs2015/terark-db/db-regex-test/db-regex-test.vcxproj.user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4-
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.7.0;C:\osc\tbb\build\vs2010\intel64\Debug-MT;%PATH%
4+
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.8.0;C:\osc\tbb\build\vs2010\intel64\Debug-MT;%PATH%
55
TerarkDB_DfaWritableSegment=mock</LocalDebuggerEnvironment>
66
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
77
<LocalDebuggerCommandArguments>C:\osc\terark\nlp\data\word-pinyin-merged.txt regex-query.txt</LocalDebuggerCommandArguments>

‎vs2015/terark-db/db-test/db-test.vcxproj.user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4-
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.7.0;C:\osc\tbb\build\vs2010\intel64\Debug-MT;%PATH%
4+
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.8.0;C:\osc\tbb\build\vs2010\intel64\Debug-MT;%PATH%
55
</LocalDebuggerEnvironment>
66
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
77
<LocalDebuggerCommandArguments>100000 &gt; stdout</LocalDebuggerCommandArguments>

‎vs2015/terark-db/db_bench_terark_index/db_bench_terark_index.vcxproj.user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
88
<LocalDebuggerCommandArguments>--benchmarks=readwhilewriting --value_size=128 --num=100000 --reads=200000 --sync_index=1 --threads=4 --db=data --read_ratio=70</LocalDebuggerCommandArguments>
99
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
10-
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.7.0;C:\osc\tbb\build\vs2010\intel64\Debug-MT;</LocalDebuggerEnvironment>
10+
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.8.0;C:\osc\tbb\build\vs2010\intel64\Debug-MT;</LocalDebuggerEnvironment>
1111
</PropertyGroup>
1212
</Project>

‎vs2015/terark-db/mongo-terarkdb/mongo-terarkdb.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@
7070
</ImportGroup>
7171
<PropertyGroup Label="UserMacros" />
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
73-
<IncludePath>C:\osc\wiredtiger-2.7.0;C:\osc\mongo\src;C:\osc\boost-home;..\..\..\..\terark\src;C:\osc\tbb\include;..\..\..\src;$(IncludePath)</IncludePath>
73+
<IncludePath>C:\osc\wiredtiger-2.8.0;C:\osc\mongo\src;C:\osc\boost-home;..\..\..\..\terark\src;C:\osc\tbb\include;..\..\..\src;$(IncludePath)</IncludePath>
7474
</PropertyGroup>
7575
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
76-
<IncludePath>C:\osc\wiredtiger-2.7.0;C:\osc\mongo\src;C:\osc\boost-home;..\..\..\..\terark\src;C:\osc\tbb\include;..\..\..\src;$(IncludePath)</IncludePath>
76+
<IncludePath>C:\osc\wiredtiger-2.8.0;C:\osc\mongo\src;C:\osc\boost-home;..\..\..\..\terark\src;C:\osc\tbb\include;..\..\..\src;$(IncludePath)</IncludePath>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
79-
<IncludePath>C:\osc\wiredtiger-2.7.0;C:\osc\mongo\src;C:\osc\boost-home;..\..\..\..\terark\src;C:\osc\tbb\include;..\..\..\src;$(IncludePath)</IncludePath>
79+
<IncludePath>C:\osc\wiredtiger-2.8.0;C:\osc\mongo\src;C:\osc\boost-home;..\..\..\..\terark\src;C:\osc\tbb\include;..\..\..\src;$(IncludePath)</IncludePath>
8080
</PropertyGroup>
8181
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
82-
<IncludePath>C:\osc\wiredtiger-2.7.0;C:\osc\mongo\src;C:\osc\boost-home;..\..\..\..\terark\src;C:\osc\tbb\include;..\..\..\src;$(IncludePath)</IncludePath>
82+
<IncludePath>C:\osc\wiredtiger-2.8.0;C:\osc\mongo\src;C:\osc\boost-home;..\..\..\..\terark\src;C:\osc\tbb\include;..\..\..\src;$(IncludePath)</IncludePath>
8383
</PropertyGroup>
8484
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8585
<ClCompile>

‎vs2015/terark-db/terark-db.sln‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "terark-db-schema-compile",
4141
EndProject
4242
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "leveldb-api", "leveldb-api\leveldb-api.vcxproj", "{1A8C2DE8-ED76-4146-B97E-C39B53958F9C}"
4343
EndProject
44+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_index", "test_index\test_index.vcxproj", "{3673A6D4-193C-4166-A1BB-B48A39CD7721}"
45+
EndProject
4446
Global
4547
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4648
Debug|x64 = Debug|x64
@@ -325,6 +327,22 @@ Global
325327
{1A8C2DE8-ED76-4146-B97E-C39B53958F9C}.RelWithDebInfo|x64.Build.0 = Release|x64
326328
{1A8C2DE8-ED76-4146-B97E-C39B53958F9C}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
327329
{1A8C2DE8-ED76-4146-B97E-C39B53958F9C}.RelWithDebInfo|x86.Build.0 = Release|Win32
330+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.Debug|x64.ActiveCfg = Debug|x64
331+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.Debug|x64.Build.0 = Debug|x64
332+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.Debug|x86.ActiveCfg = Debug|Win32
333+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.Debug|x86.Build.0 = Debug|Win32
334+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.MinSizeRel|x64.ActiveCfg = Release|x64
335+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.MinSizeRel|x64.Build.0 = Release|x64
336+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.MinSizeRel|x86.ActiveCfg = Release|Win32
337+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.MinSizeRel|x86.Build.0 = Release|Win32
338+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.Release|x64.ActiveCfg = Release|x64
339+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.Release|x64.Build.0 = Release|x64
340+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.Release|x86.ActiveCfg = Release|Win32
341+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.Release|x86.Build.0 = Release|Win32
342+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.RelWithDebInfo|x64.ActiveCfg = Release|x64
343+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.RelWithDebInfo|x64.Build.0 = Release|x64
344+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
345+
{3673A6D4-193C-4166-A1BB-B48A39CD7721}.RelWithDebInfo|x86.Build.0 = Release|Win32
328346
EndGlobalSection
329347
GlobalSection(SolutionProperties) = preSolution
330348
HideSolutionNode = FALSE

‎vs2015/terark-db/terark-db/terark-db.vcxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,28 +71,28 @@
7171
<PropertyGroup Label="UserMacros" />
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7373
<LinkIncremental>true</LinkIncremental>
74-
<IncludePath>C:\osc\boost-home;..\..\..\..\terark\src;C:\osc\tbb\include;..\..\..\src;C:\osc\wiredtiger-2.7.0;C:\osc\mongo\src;..\..\..\..\terark\3rdparty\re2;$(IncludePath)</IncludePath>
75-
<LibraryPath>C:\osc\wiredtiger-2.7.0;C:\osc\boost_1_59_0\stage\lib;C:\osc\tbb\build\vs2010\ia32\Debug-MT;C:\osc\tbb\build\vs2010\ia32\Release-MT;$(LibraryPath)</LibraryPath>
76-
<ExecutablePath>C:\osc\wiredtiger-2.7.0;$(ExecutablePath)</ExecutablePath>
74+
<IncludePath>C:\osc\boost-home;..\..\..\..\terark\src;C:\osc\tbb\include;..\..\..\src;C:\osc\wiredtiger-2.8.0;C:\osc\mongo\src;..\..\..\..\terark\3rdparty\re2;$(IncludePath)</IncludePath>
75+
<LibraryPath>C:\osc\wiredtiger-2.8.0;C:\osc\boost_1_59_0\stage\lib;C:\osc\tbb\build\vs2010\ia32\Debug-MT;C:\osc\tbb\build\vs2010\ia32\Release-MT;$(LibraryPath)</LibraryPath>
76+
<ExecutablePath>C:\osc\wiredtiger-2.8.0;$(ExecutablePath)</ExecutablePath>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7979
<LinkIncremental>true</LinkIncremental>
8080
<IncludePath>..\..\..\src;..\..\..\api\leveldb\;..\..\..\api\leveldb\leveldb\include;..\..\..\api\leveldb\leveldb;..\..\..\..\terark\src;..\..\..\..\terark\3rdparty\re2;..\..\..\..\boost-home;..\..\..\..\tbb\include;..\..\..\..\wiredtiger-2.8.0;..\..\..\..\mongo\src;$(IncludePath)</IncludePath>
81-
<LibraryPath>C:\osc\wiredtiger-2.7.0;C:\osc\tbb\build\vs2010\intel64\Debug-MT;C:\osc\boost-home\stage\lib;$(LibraryPath)</LibraryPath>
82-
<ExecutablePath>C:\osc\wiredtiger-2.7.0;$(ExecutablePath)</ExecutablePath>
81+
<LibraryPath>C:\osc\wiredtiger-2.8.0;C:\osc\tbb\build\vs2010\intel64\Debug-MT;C:\osc\boost-home\stage\lib;$(LibraryPath)</LibraryPath>
82+
<ExecutablePath>C:\osc\wiredtiger-2.8.0;$(ExecutablePath)</ExecutablePath>
8383
<TargetName>$(ProjectName)-d</TargetName>
8484
</PropertyGroup>
8585
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8686
<LinkIncremental>false</LinkIncremental>
87-
<IncludePath>C:\osc\boost-home;..\..\..\..\terark\src;C:\osc\tbb\include;..\..\..\src;C:\osc\wiredtiger-2.7.0;C:\osc\mongo\src;..\..\..\..\terark\3rdparty\re2;$(IncludePath)</IncludePath>
88-
<LibraryPath>C:\osc\wiredtiger-2.7.0;C:\osc\boost_1_59_0\stage\lib;C:\osc\tbb\build\vs2010\ia32\Debug-MT;C:\osc\tbb\build\vs2010\ia32\Release-MT;$(LibraryPath)</LibraryPath>
89-
<ExecutablePath>C:\osc\wiredtiger-2.7.0;$(ExecutablePath)</ExecutablePath>
87+
<IncludePath>C:\osc\boost-home;..\..\..\..\terark\src;C:\osc\tbb\include;..\..\..\src;C:\osc\wiredtiger-2.8.0;C:\osc\mongo\src;..\..\..\..\terark\3rdparty\re2;$(IncludePath)</IncludePath>
88+
<LibraryPath>C:\osc\wiredtiger-2.8.0;C:\osc\boost_1_59_0\stage\lib;C:\osc\tbb\build\vs2010\ia32\Debug-MT;C:\osc\tbb\build\vs2010\ia32\Release-MT;$(LibraryPath)</LibraryPath>
89+
<ExecutablePath>C:\osc\wiredtiger-2.8.0;$(ExecutablePath)</ExecutablePath>
9090
</PropertyGroup>
9191
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
9292
<LinkIncremental>false</LinkIncremental>
9393
<IncludePath>..\..\..\src;..\..\..\api\leveldb\;..\..\..\api\leveldb\leveldb\include;..\..\..\api\leveldb\leveldb;..\..\..\..\terark\src;..\..\..\..\terark\3rdparty\re2;..\..\..\..\boost-home;..\..\..\..\tbb\include;..\..\..\..\wiredtiger-2.8.0;..\..\..\..\mongo\src;$(IncludePath)</IncludePath>
94-
<LibraryPath>C:\osc\wiredtiger-2.7.0;C:\osc\tbb\build\vs2010\intel64\Release-MT;C:\osc\boost-home\stage\lib;$(LibraryPath)</LibraryPath>
95-
<ExecutablePath>C:\osc\wiredtiger-2.7.0;$(ExecutablePath)</ExecutablePath>
94+
<LibraryPath>C:\osc\wiredtiger-2.8.0;C:\osc\tbb\build\vs2010\intel64\Release-MT;C:\osc\boost-home\stage\lib;$(LibraryPath)</LibraryPath>
95+
<ExecutablePath>C:\osc\wiredtiger-2.8.0;$(ExecutablePath)</ExecutablePath>
9696
<TargetName>$(ProjectName)-r</TargetName>
9797
</PropertyGroup>
9898
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

‎vs2015/terark-db/terark-db/terark-db.vcxproj.user‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
4-
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.7.0;%PATH%</LocalDebuggerEnvironment>
4+
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.8.0;%PATH%</LocalDebuggerEnvironment>
55
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
66
</PropertyGroup>
77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8-
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.7.0;%PATH%</LocalDebuggerEnvironment>
8+
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.8.0;%PATH%</LocalDebuggerEnvironment>
99
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1010
</PropertyGroup>
1111
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
12-
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.7.0;%PATH%</LocalDebuggerEnvironment>
12+
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.8.0;%PATH%</LocalDebuggerEnvironment>
1313
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1414
</PropertyGroup>
1515
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
16-
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.7.0;%PATH%</LocalDebuggerEnvironment>
16+
<LocalDebuggerEnvironment>PATH=C:\osc\wiredtiger-2.8.0;%PATH%</LocalDebuggerEnvironment>
1717
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1818
</PropertyGroup>
1919
</Project>

‎vs2015/terark-db/terarkdb_import/terarkdb_import.vcxproj.user‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
44
<LocalDebuggerCommandArguments>D:\Xiaomi\sina.tweet.debug -L 100000 E:\Data.YiDianZiXun\tweet_2012_test</LocalDebuggerCommandArguments>
55
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
6-
<LocalDebuggerEnvironment>PATH=C:\osc\tbb\build\vs2010\intel64\Debug-MT;C:\osc\wiredtiger-2.7.0;%PATH%</LocalDebuggerEnvironment>
6+
<LocalDebuggerEnvironment>PATH=C:\osc\tbb\build\vs2010\intel64\Debug-MT;C:\osc\wiredtiger-2.8.0;%PATH%</LocalDebuggerEnvironment>
77
</PropertyGroup>
88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
9-
<LocalDebuggerEnvironment>PATH=C:\osc\tbb\build\vs2010\intel64\Release-MT;C:\osc\wiredtiger-2.7.0;%PATH%</LocalDebuggerEnvironment>
9+
<LocalDebuggerEnvironment>PATH=C:\osc\tbb\build\vs2010\intel64\Release-MT;C:\osc\wiredtiger-2.8.0;%PATH%</LocalDebuggerEnvironment>
1010
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1111
<LocalDebuggerCommandArguments>D:\Xiaomi\sina.tweet E:\Data.YiDianZiXun\tweet_2012_test</LocalDebuggerCommandArguments>
1212
</PropertyGroup>

0 commit comments

Comments
 (0)