diff options
Diffstat (limited to 'build_windows/VS10')
38 files changed, 413 insertions, 151 deletions
diff --git a/build_windows/VS10/application.props b/build_windows/VS10/application.props index 3f2bc015..c27991de 100644 --- a/build_windows/VS10/application.props +++ b/build_windows/VS10/application.props @@ -2,7 +2,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
- <BDB_VERSION>53</BDB_VERSION>
+ <BDB_VERSION>61</BDB_VERSION>
</PropertyGroup>
<PropertyGroup>
<OutDir>..\..\build_windows\$(Platform)\$(Configuration)\</OutDir>
diff --git a/build_windows/VS10/db.vcxproj b/build_windows/VS10/db.vcxproj index cce29506..6a534581 100644 --- a/build_windows/VS10/db.vcxproj +++ b/build_windows/VS10/db.vcxproj @@ -151,6 +151,10 @@ </ItemDefinitionGroup> <ItemGroup> <ClCompile Condition="exists('..\..\src\crypto\aes_method.c')" Include="..\..\src\crypto\aes_method.c"/> + <ClCompile Include="..\..\src\blob\blob_fileops.c"/> + <ClCompile Include="..\..\src\blob\blob_page.c"/> + <ClCompile Include="..\..\src\blob\blob_stream.c"/> + <ClCompile Include="..\..\src\blob\blob_util.c"/> <ClCompile Include="..\..\src\btree\bt_compact.c"/> <ClCompile Include="..\..\src\btree\bt_compare.c"/> <ClCompile Include="..\..\src\btree\bt_compress.c"/> @@ -177,6 +181,7 @@ <ClCompile Include="..\..\lang\cxx\cxx_channel.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_db.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_dbc.cpp"/> + <ClCompile Include="..\..\lang\cxx\cxx_dbstream.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_dbt.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_env.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_except.cpp"/> @@ -271,7 +276,6 @@ <ClCompile Include="..\..\src\hash\hash_verify.c"/> <ClCompile Include="..\..\src\heap\heap.c"/> <ClCompile Include="..\..\src\heap\heap_auto.c"/> - <ClCompile Include="..\..\src\heap\heap_autop.c"/> <ClCompile Include="..\..\src\heap\heap_backup.c"/> <ClCompile Include="..\..\src\heap\heap_conv.c"/> <ClCompile Include="..\..\src\heap\heap_method.c"/> @@ -279,6 +283,7 @@ <ClCompile Include="..\..\src\heap\heap_rec.c"/> <ClCompile Include="..\..\src\heap\heap_reclaim.c"/> <ClCompile Include="..\..\src\heap\heap_stat.c"/> + <ClCompile Include="..\..\src\heap\heap_upgrade.c"/> <ClCompile Include="..\..\src\heap\heap_verify.c"/> <ClCompile Include="..\..\src\hmac\hmac.c"/> <ClCompile Include="..\..\lang\hsearch\hsearch.c"/> @@ -349,6 +354,7 @@ <ClCompile Include="..\..\src\os_windows\os_map.c"/> <ClCompile Include="..\..\src\os_windows\os_mkdir.c"/> <ClCompile Include="..\..\src\os_windows\os_open.c"/> + <ClCompile Include="..\..\src\os_windows\os_rmdir.c"/> <ClCompile Include="..\..\src\os\os_path.c"/> <ClCompile Include="..\..\src\os\os_pid.c"/> <ClCompile Include="..\..\src\os_windows\os_rename.c"/> @@ -424,7 +430,7 @@ <None Include="../libdb.def"/> </ItemGroup> <ItemGroup> - <ResourceCompile Include="../libdb.rc"> + <ResourceCompile Include="..\..\build_windows\libdb.rc"> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_DEBUG;$(NoInherit));%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'">NDEBUG;$(NoInherit));%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NDEBUG;$(NoInherit));%(PreprocessorDefinitions)</PreprocessorDefinitions> diff --git a/build_windows/VS10/db_csharp.vcxproj b/build_windows/VS10/db_csharp.vcxproj index bff570b9..c7f79d37 100644 --- a/build_windows/VS10/db_csharp.vcxproj +++ b/build_windows/VS10/db_csharp.vcxproj @@ -57,10 +57,10 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;CONFIG_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,15 +68,15 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;CONFIG_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/db_java.vcxproj b/build_windows/VS10/db_java.vcxproj index 4c2e515f..2fb8643f 100644 --- a/build_windows/VS10/db_java.vcxproj +++ b/build_windows/VS10/db_java.vcxproj @@ -60,20 +60,21 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <CustomBuildStep> <Command> echo compiling Berkeley DB Java classes mkdir "./$(OutDir)/classes/" -javac -g -target 1.5 -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java +javac -g -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cfm "$(OutDir)/db.jar" ../..\lang/java/jarManifestEntries -C "$(OutDir)\classes" . -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cfm "db.jar" ../../..\lang/java/jarManifestEntries -C "classes" . +jar cf "dbexamples.jar" -C "classes.ex" . echo Java build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> @@ -83,20 +84,21 @@ echo Java build finished</Command> <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <CustomBuildStep> <Command> echo compiling Berkeley DB Java classes mkdir "./$(OutDir)/classes/" -javac -g -target 1.5 -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java +javac -g -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cfm "$(OutDir)/db.jar" ../..\lang/java/jarManifestEntries -C "$(OutDir)\classes" . -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cfm "db.jar" ../../..\lang/java/jarManifestEntries -C "classes" . +jar cf "dbexamples.jar" -C "classes.ex" . echo Java build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> @@ -106,20 +108,21 @@ echo Java build finished</Command> <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <CustomBuildStep> <Command> echo compiling Berkeley DB Java classes mkdir "./$(OutDir)/classes/" -javac -g -target 1.5 -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java +javac -g -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cfm "$(OutDir)/db.jar" ../..\lang/java/jarManifestEntries -C "$(OutDir)\classes" . -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cfm "db.jar" ../../..\lang/java/jarManifestEntries -C "classes" . +jar cf "dbexamples.jar" -C "classes.ex" . echo Java build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> @@ -129,20 +132,21 @@ echo Java build finished</Command> <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <CustomBuildStep> <Command> echo compiling Berkeley DB Java classes mkdir "./$(OutDir)/classes/" -javac -g -target 1.5 -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java +javac -g -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cfm "$(OutDir)/db.jar" ../..\lang/java/jarManifestEntries -C "$(OutDir)\classes" . -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cfm "db.jar" ../../..\lang/java/jarManifestEntries -C "classes" . +jar cf "dbexamples.jar" -C "classes.ex" . echo Java build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> diff --git a/build_windows/VS10/db_printlog.vcxproj b/build_windows/VS10/db_printlog.vcxproj index b746c0d6..d1a1c369 100644 --- a/build_windows/VS10/db_printlog.vcxproj +++ b/build_windows/VS10/db_printlog.vcxproj @@ -63,6 +63,7 @@ <ClCompile Include="..\..\src\dbreg\dbreg_autop.c"/> <ClCompile Include="..\..\src\fileops\fileops_autop.c"/> <ClCompile Include="..\..\src\hash\hash_autop.c"/> + <ClCompile Include="..\..\src\heap\heap_autop.c"/> <ClCompile Include="..\..\src\qam\qam_autop.c"/> <ClCompile Include="..\..\src\repmgr\repmgr_autop.c"/> <ClCompile Include="..\..\src\txn\txn_autop.c"/> diff --git a/build_windows/VS10/db_reptest.vcxproj b/build_windows/VS10/db_reptest.vcxproj new file mode 100644 index 00000000..5bf687c5 --- /dev/null +++ b/build_windows/VS10/db_reptest.vcxproj @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8" ?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="4.0"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{{4786F27F-FF38-42e8-87C1-CC3B6E544C5D}}</ProjectGuid> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform"/> + </ImportGroup> + <ImportGroup> + <Import Project="application.props"/> + </ImportGroup> + <PropertyGroup Label="UserMacros"/> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + </PropertyGroup> + <ItemGroup> + <ClCompile Include="..\..\test\repmgr\db_reptest.c"/> + <ClCompile Include="..\..\test\repmgr\reptest_am.c"/> + <ClCompile Include="..\..\test\repmgr\reptest_handles.c"/> + <ClCompile Include="..\..\test\repmgr\reptest_spawn.c"/> + <ClCompile Include="..\..\test\repmgr\reptest_util.c"/> + <ClCompile Include="..\..\src\clib\getopt.c"/> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> + <ItemGroup> + </ItemGroup> +</Project> diff --git a/build_windows/VS10/db_small.vcxproj b/build_windows/VS10/db_small.vcxproj index 3c67d572..4849826e 100644 --- a/build_windows/VS10/db_small.vcxproj +++ b/build_windows/VS10/db_small.vcxproj @@ -150,6 +150,10 @@ </Link> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\src\blob\blob_fileops.c"/> + <ClCompile Include="..\..\src\blob\blob_page.c"/> + <ClCompile Include="..\..\src\blob\blob_stream.c"/> + <ClCompile Include="..\..\src\blob\blob_util.c"/> <ClCompile Include="..\..\src\btree\bt_compact.c"/> <ClCompile Include="..\..\src\btree\bt_compare.c"/> <ClCompile Include="..\..\src\btree\bt_conv.c"/> @@ -188,6 +192,7 @@ <ClCompile Include="..\..\lang\cxx\cxx_channel.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_db.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_dbc.cpp"/> + <ClCompile Include="..\..\lang\cxx\cxx_dbstream.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_dbt.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_env.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_except.cpp"/> @@ -324,6 +329,7 @@ <ClCompile Include="..\..\src\os_windows\os_map.c"/> <ClCompile Include="..\..\src\os_windows\os_mkdir.c"/> <ClCompile Include="..\..\src\os_windows\os_open.c"/> + <ClCompile Include="..\..\src\os_windows\os_rmdir.c"/> <ClCompile Include="..\..\src\os\os_path.c"/> <ClCompile Include="..\..\src\os_windows\os_rename.c"/> <ClCompile Include="..\..\src\os_windows\os_rw.c"/> diff --git a/build_windows/VS10/db_sql.vcxproj b/build_windows/VS10/db_sql.vcxproj index dbd7093f..ffbd5c63 100644 --- a/build_windows/VS10/db_sql.vcxproj +++ b/build_windows/VS10/db_sql.vcxproj @@ -98,7 +98,7 @@ </ClCompile> <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'"> @@ -113,7 +113,7 @@ <PreprocessorDefinitions>SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_CORE;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_LOAD_EXTENSION;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|Win32'"> @@ -129,7 +129,7 @@ </ClCompile> <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'"> @@ -144,7 +144,7 @@ <PreprocessorDefinitions>SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_CORE;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_LOAD_EXTENSION;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|x64'"> @@ -182,7 +182,9 @@ <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_icu.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_porter.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_snippet.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_term.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenizer1.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenize_vtab.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenizer.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_write.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\func.c"/> @@ -230,6 +232,7 @@ <ClCompile Include="..\..\lang\sql\sqlite\src\vdbeaux.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vdbeblob.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vdbemem.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\src\vdbesort.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vdbetrace.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vtab.c"/> <ClCompile Include="..\..\lang\sql\adapter\wal.c"/> diff --git a/build_windows/VS10/db_sql_jdbc.vcxproj b/build_windows/VS10/db_sql_jdbc.vcxproj index 4bb7106f..39087b91 100644 --- a/build_windows/VS10/db_sql_jdbc.vcxproj +++ b/build_windows/VS10/db_sql_jdbc.vcxproj @@ -65,17 +65,18 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;HAVE_SQLITE3;HAVE_SQLITE3_MALLOC=1;HAVE_SQLITE3_PREPARE_V2=1;HAVE_SQLITE3_PREPARE16_V2=1;HAVE_SQLITE3_BIND_ZEROBLOB=1;HAVE_SQLITE3_CLEAR_BINDINGS=1;HAVE_SQLITE3_BIND_PARAMETER_COUNT=1;HAVE_SQLITE3_BIND_PARAMETER_NAME=1;HAVE_SQLITE3_BIND_PARAMETER_INDEX=1;HAVE_SQLITE3_RESULT_ZEROBLOB=1;HAVE_SQLITE3_INCRBLOBIO=1;HAVE_SQLITE3_SHARED_CACHE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <PreBuildEvent> <Command> mkdir "./$(OutDir)/jdbc_classes/" echo compiling JDBC classes -javac -g -target 1.5 -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java +javac -g -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java echo Building JNI header files javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob echo creating jar file -jar cf "$(OutDir)\jdbc.jar" -C "$(OutDir)\jdbc_classes" . +cd $(OutDir) +jar cf "jdbc.jar" -C "jdbc_classes" . echo JDBC build finished</Command> <Message/> </PreBuildEvent> @@ -86,17 +87,18 @@ echo JDBC build finished</Command> <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;HAVE_SQLITE3;HAVE_SQLITE3_MALLOC=1;HAVE_SQLITE3_PREPARE_V2=1;HAVE_SQLITE3_PREPARE16_V2=1;HAVE_SQLITE3_BIND_ZEROBLOB=1;HAVE_SQLITE3_CLEAR_BINDINGS=1;HAVE_SQLITE3_BIND_PARAMETER_COUNT=1;HAVE_SQLITE3_BIND_PARAMETER_NAME=1;HAVE_SQLITE3_BIND_PARAMETER_INDEX=1;HAVE_SQLITE3_RESULT_ZEROBLOB=1;HAVE_SQLITE3_INCRBLOBIO=1;HAVE_SQLITE3_SHARED_CACHE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <PreBuildEvent> <Command> mkdir "./$(OutDir)/jdbc_classes/" echo compiling JDBC classes -javac -g -target 1.5 -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java +javac -g -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java echo Building JNI header files javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob echo creating jar file -jar cf "$(OutDir)\jdbc.jar" -C "$(OutDir)\jdbc_classes" . +cd $(OutDir) +jar cf "jdbc.jar" -C "jdbc_classes" . echo JDBC build finished</Command> <Message/> </PreBuildEvent> @@ -107,17 +109,18 @@ echo JDBC build finished</Command> <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;HAVE_SQLITE3;HAVE_SQLITE3_MALLOC=1;HAVE_SQLITE3_PREPARE_V2=1;HAVE_SQLITE3_PREPARE16_V2=1;HAVE_SQLITE3_BIND_ZEROBLOB=1;HAVE_SQLITE3_CLEAR_BINDINGS=1;HAVE_SQLITE3_BIND_PARAMETER_COUNT=1;HAVE_SQLITE3_BIND_PARAMETER_NAME=1;HAVE_SQLITE3_BIND_PARAMETER_INDEX=1;HAVE_SQLITE3_RESULT_ZEROBLOB=1;HAVE_SQLITE3_INCRBLOBIO=1;HAVE_SQLITE3_SHARED_CACHE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <PreBuildEvent> <Command> mkdir "./$(OutDir)/jdbc_classes/" echo compiling JDBC classes -javac -g -target 1.5 -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java +javac -g -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java echo Building JNI header files javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob echo creating jar file -jar cf "$(OutDir)\jdbc.jar" -C "$(OutDir)\jdbc_classes" . +cd $(OutDir) +jar cf "jdbc.jar" -C "jdbc_classes" . echo JDBC build finished</Command> <Message/> </PreBuildEvent> @@ -128,17 +131,18 @@ echo JDBC build finished</Command> <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;HAVE_SQLITE3;HAVE_SQLITE3_MALLOC=1;HAVE_SQLITE3_PREPARE_V2=1;HAVE_SQLITE3_PREPARE16_V2=1;HAVE_SQLITE3_BIND_ZEROBLOB=1;HAVE_SQLITE3_CLEAR_BINDINGS=1;HAVE_SQLITE3_BIND_PARAMETER_COUNT=1;HAVE_SQLITE3_BIND_PARAMETER_NAME=1;HAVE_SQLITE3_BIND_PARAMETER_INDEX=1;HAVE_SQLITE3_RESULT_ZEROBLOB=1;HAVE_SQLITE3_INCRBLOBIO=1;HAVE_SQLITE3_SHARED_CACHE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <PreBuildEvent> <Command> mkdir "./$(OutDir)/jdbc_classes/" echo compiling JDBC classes -javac -g -target 1.5 -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java +javac -g -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java echo Building JNI header files javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob echo creating jar file -jar cf "$(OutDir)\jdbc.jar" -C "$(OutDir)\jdbc_classes" . +cd $(OutDir) +jar cf "jdbc.jar" -C "jdbc_classes" . echo JDBC build finished</Command> <Message/> </PreBuildEvent> diff --git a/build_windows/VS10/db_sql_odbc.vcxproj b/build_windows/VS10/db_sql_odbc.vcxproj index 1d0c4e76..6649b8e5 100644 --- a/build_windows/VS10/db_sql_odbc.vcxproj +++ b/build_windows/VS10/db_sql_odbc.vcxproj @@ -61,7 +61,7 @@ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USRDLL;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;SQLITE_CORE;_WIN32;WITHOUT_SHELL;HAVE_SQLITE3PREPAREV2=1;NO_TCL;THREADSAFE=1;SQLITE_DLL=1;SQLITE_THREADSAFE=1;SQLITE_OS_WIN=1;SQLITE_ASCII=1;SQLITE_SOUNDEX=1;SQLITE_OMIT_SHARED_CACHE=1;SQLITE_OMIT_EXPLAIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\lang\sql\odbc\sqlite3odbc.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -71,7 +71,7 @@ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USRDLL;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;SQLITE_CORE;_WIN32;WITHOUT_SHELL;HAVE_SQLITE3PREPAREV2=1;NO_TCL;THREADSAFE=1;SQLITE_DLL=1;SQLITE_THREADSAFE=1;SQLITE_OS_WIN=1;SQLITE_ASCII=1;SQLITE_SOUNDEX=1;SQLITE_OMIT_SHARED_CACHE=1;SQLITE_OMIT_EXPLAIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\lang\sql\odbc\sqlite3odbc.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -81,7 +81,7 @@ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USRDLL;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;SQLITE_CORE;_WIN32;WITHOUT_SHELL;HAVE_SQLITE3PREPAREV2=1;NO_TCL;THREADSAFE=1;SQLITE_DLL=1;SQLITE_THREADSAFE=1;SQLITE_OS_WIN=1;SQLITE_ASCII=1;SQLITE_SOUNDEX=1;SQLITE_OMIT_SHARED_CACHE=1;SQLITE_OMIT_EXPLAIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\lang\sql\odbc\sqlite3odbc.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -91,7 +91,7 @@ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USRDLL;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;SQLITE_CORE;_WIN32;WITHOUT_SHELL;HAVE_SQLITE3PREPAREV2=1;NO_TCL;THREADSAFE=1;SQLITE_DLL=1;SQLITE_THREADSAFE=1;SQLITE_OS_WIN=1;SQLITE_ASCII=1;SQLITE_SOUNDEX=1;SQLITE_OMIT_SHARED_CACHE=1;SQLITE_OMIT_EXPLAIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\lang\sql\odbc\sqlite3odbc.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -99,7 +99,7 @@ <ClCompile Include="..\..\lang\sql\odbc\sqlite3odbc.c"/> </ItemGroup> <ItemGroup> - <ResourceCompile Include="../sql/odbc/sqlite3odbc.rc"> + <ResourceCompile Include="..\..\lang\sql\odbc\sqlite3odbc.rc"> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_DEBUG;$(NoInherit));%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NDEBUG;$(NoInherit));%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_DEBUG;$(NoInherit));%(PreprocessorDefinitions)</PreprocessorDefinitions> diff --git a/build_windows/VS10/db_sql_shell.vcxproj b/build_windows/VS10/db_sql_shell.vcxproj index 7ff5c711..cd6dbefb 100644 --- a/build_windows/VS10/db_sql_shell.vcxproj +++ b/build_windows/VS10/db_sql_shell.vcxproj @@ -62,7 +62,7 @@ <PreprocessorDefinitions>WIN32;_CONSOLE;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;SQLITE_DEBUG;SQLITE_MEMDEBUG;;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -71,7 +71,7 @@ <PreprocessorDefinitions>WIN32;_CONSOLE;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -80,7 +80,7 @@ <PreprocessorDefinitions>WIN32;_CONSOLE;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;SQLITE_DEBUG;SQLITE_MEMDEBUG;;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -89,7 +89,7 @@ <PreprocessorDefinitions>WIN32;_CONSOLE;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/db_sql_testfixture.vcxproj b/build_windows/VS10/db_sql_testfixture.vcxproj index 8acd2083..dcd7e96b 100644 --- a/build_windows/VS10/db_sql_testfixture.vcxproj +++ b/build_windows/VS10/db_sql_testfixture.vcxproj @@ -62,7 +62,7 @@ <PreprocessorDefinitions>WIN32;_CONSOL;STATIC_BUILD;SQLITE_TEST;TCLSH;SQLITE_NO_SYNC;SQLITE_CRASH_TEST;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;SQLITE_MEMDEBUG;;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>tcl85g.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -80,7 +80,7 @@ <PreprocessorDefinitions>WIN32;_CONSOL;STATIC_BUILD;SQLITE_TEST;TCLSH;SQLITE_NO_SYNC;SQLITE_CRASH_TEST;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;SQLITE_MEMDEBUG;;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>tcl85g.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -120,9 +120,25 @@ <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_icu.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_porter.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_snippet.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_term.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_test.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenizer1.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenizer.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenize_vtab.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_write.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\amatch.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\closure.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\fuzzer.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\ieee754.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\nextchar.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\percentile.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\regexp.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\rot13.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\spellfix.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\totype.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\vfslog.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\vtshim.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\wholenumber.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\func.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\global.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\hash.c"/> @@ -170,6 +186,7 @@ <ClCompile Include="..\..\lang\sql\sqlite\src\vdbeaux.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vdbeblob.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vdbemem.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\src\vdbesort.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vdbetrace.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vtab.c"/> <ClCompile Include="..\..\lang\sql\adapter\wal.c"/> @@ -193,8 +210,8 @@ <ClCompile Include="..\..\lang\sql\sqlite\src\test_config.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_demovfs.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_devsym.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\src\test_fs.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_func.c"/> - <ClCompile Include="..\..\lang\sql\sqlite\src\test_fuzzer.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_hexio.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_intarray.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_journal.c"/> @@ -216,7 +233,6 @@ <ClCompile Include="..\..\lang\sql\sqlite\src\test_thread.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_vfs.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_vfstrace.c"/> - <ClCompile Include="..\..\lang\sql\sqlite\src\test_wholenumber.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_wsd.c"/> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> diff --git a/build_windows/VS10/db_stl.vcxproj b/build_windows/VS10/db_stl.vcxproj index e193c137..57805a40 100644 --- a/build_windows/VS10/db_stl.vcxproj +++ b/build_windows/VS10/db_stl.vcxproj @@ -97,7 +97,7 @@ <PreprocessorDefinitions>_UNICODE;UNICODE;DB_CREATE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'"> @@ -112,7 +112,7 @@ <PreprocessorDefinitions>_UNICODE;UNICODE;DB_CREATE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|Win32'"> @@ -127,7 +127,7 @@ <PreprocessorDefinitions>_UNICODE;UNICODE;DB_CREATE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'"> @@ -142,7 +142,7 @@ <PreprocessorDefinitions>_UNICODE;UNICODE;DB_CREATE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|x64'"> diff --git a/build_windows/VS10/db_tcl.vcxproj b/build_windows/VS10/db_tcl.vcxproj index b1fffe9d..da0bbb46 100644 --- a/build_windows/VS10/db_tcl.vcxproj +++ b/build_windows/VS10/db_tcl.vcxproj @@ -60,7 +60,7 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;DB_TCL_SUPPORT;CONFIG_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;tcl85g.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\build_windows\libdb_tcl.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -69,7 +69,7 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;DB_TCL_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\build_windows\libdb_tcl.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -78,7 +78,7 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;DB_TCL_SUPPORT;CONFIG_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;tcl85g.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\build_windows\libdb_tcl.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -87,7 +87,7 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;DB_TCL_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\build_windows\libdb_tcl.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -98,6 +98,7 @@ <ClCompile Include="..\..\lang\tcl\tcl_db.c"/> <ClCompile Include="..\..\lang\tcl\tcl_db_pkg.c"/> <ClCompile Include="..\..\lang\tcl\tcl_dbcursor.c"/> + <ClCompile Include="..\..\lang\tcl\tcl_dbstream.c"/> <ClCompile Include="..\..\lang\tcl\tcl_env.c"/> <ClCompile Include="..\..\lang\tcl\tcl_internal.c"/> <ClCompile Include="..\..\lang\tcl\tcl_lock.c"/> diff --git a/build_windows/VS10/ex_blob.vcxproj b/build_windows/VS10/ex_blob.vcxproj new file mode 100644 index 00000000..df5ff0a8 --- /dev/null +++ b/build_windows/VS10/ex_blob.vcxproj @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8" ?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="4.0"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{0460962E-97E3-40fd-B3CD-702085F2FC98}</ProjectGuid> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform"/> + </ImportGroup> + <ImportGroup> + <Import Project="application.props"/> + </ImportGroup> + <PropertyGroup Label="UserMacros"/> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + </PropertyGroup> + <ItemGroup> + <ClCompile Include="..\..\src\clib\getopt.c"/> + <ClCompile Include="..\..\examples\c\ex_blob.c"/> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> + <ItemGroup> + <ProjectReference Condition="exists('db.vcxproj')" Include="db.vcxproj"> + <Project>{fd045d60-abad-4a6c-9794-9bfb085fc3e7}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> +</Project> diff --git a/build_windows/VS10/ex_java.vcxproj b/build_windows/VS10/ex_java.vcxproj index 7ea9a9e2..fa3ff587 100644 --- a/build_windows/VS10/ex_java.vcxproj +++ b/build_windows/VS10/ex_java.vcxproj @@ -60,9 +60,10 @@ <Command> echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cf "dbexamples.jar" -C "classes.ex" . echo Java example build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> @@ -72,9 +73,10 @@ echo Java example build finished</Command> <Command> echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cf "dbexamples.jar" -C "classes.ex" . echo Java example build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> @@ -84,9 +86,10 @@ echo Java example build finished</Command> <Command> echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cf "dbexamples.jar" -C "classes.ex" . echo Java example build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> @@ -96,9 +99,10 @@ echo Java example build finished</Command> <Command> echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cf "dbexamples.jar" -C "classes.ex" . echo Java example build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> diff --git a/build_windows/VS10/ex_sql_binding.vcxproj b/build_windows/VS10/ex_sql_binding.vcxproj index 4f0d89c7..e9306029 100644 --- a/build_windows/VS10/ex_sql_binding.vcxproj +++ b/build_windows/VS10/ex_sql_binding.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_fts3.vcxproj b/build_windows/VS10/ex_sql_fts3.vcxproj index 586fb860..c4bf3930 100644 --- a/build_windows/VS10/ex_sql_fts3.vcxproj +++ b/build_windows/VS10/ex_sql_fts3.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_index.vcxproj b/build_windows/VS10/ex_sql_index.vcxproj index b4afbcbf..7a53235d 100644 --- a/build_windows/VS10/ex_sql_index.vcxproj +++ b/build_windows/VS10/ex_sql_index.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_load.vcxproj b/build_windows/VS10/ex_sql_load.vcxproj index b4087c72..f670af88 100644 --- a/build_windows/VS10/ex_sql_load.vcxproj +++ b/build_windows/VS10/ex_sql_load.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_multi_thread.vcxproj b/build_windows/VS10/ex_sql_multi_thread.vcxproj index 12553f71..cf551e1f 100644 --- a/build_windows/VS10/ex_sql_multi_thread.vcxproj +++ b/build_windows/VS10/ex_sql_multi_thread.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_query.vcxproj b/build_windows/VS10/ex_sql_query.vcxproj index 491bfae1..fbc1dddb 100644 --- a/build_windows/VS10/ex_sql_query.vcxproj +++ b/build_windows/VS10/ex_sql_query.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_rtree.vcxproj b/build_windows/VS10/ex_sql_rtree.vcxproj index a749e9ac..05e98747 100644 --- a/build_windows/VS10/ex_sql_rtree.vcxproj +++ b/build_windows/VS10/ex_sql_rtree.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_savepoint.vcxproj b/build_windows/VS10/ex_sql_savepoint.vcxproj index 8b6a451b..c77ac245 100644 --- a/build_windows/VS10/ex_sql_savepoint.vcxproj +++ b/build_windows/VS10/ex_sql_savepoint.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_statement.vcxproj b/build_windows/VS10/ex_sql_statement.vcxproj index a2df5aad..7923e365 100644 --- a/build_windows/VS10/ex_sql_statement.vcxproj +++ b/build_windows/VS10/ex_sql_statement.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_transaction.vcxproj b/build_windows/VS10/ex_sql_transaction.vcxproj index f541a804..5216c237 100644 --- a/build_windows/VS10/ex_sql_transaction.vcxproj +++ b/build_windows/VS10/ex_sql_transaction.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/excxx_bulk.vcxproj b/build_windows/VS10/excxx_bulk.vcxproj new file mode 100644 index 00000000..d99a9350 --- /dev/null +++ b/build_windows/VS10/excxx_bulk.vcxproj @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8" ?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="4.0"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5AEBE8D9-4B6D-46AA-B810-30CD7E6BBD5F}</ProjectGuid> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform"/> + </ImportGroup> + <ImportGroup> + <Import Project="application.props"/> + </ImportGroup> + <PropertyGroup Label="UserMacros"/> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + </PropertyGroup> + <ItemGroup> + <ClCompile Include="..\..\src\clib\getopt.c"/> + <ClCompile Include="..\..\examples\cxx\BulkExample.cpp"/> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> + <ItemGroup> + <ProjectReference Condition="exists('db.vcxproj')" Include="db.vcxproj"> + <Project>{fd045d60-abad-4a6c-9794-9bfb085fc3e7}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> +</Project> diff --git a/build_windows/VS10/exstl_access.vcxproj b/build_windows/VS10/exstl_access.vcxproj index 7fff3ba5..33f33cef 100644 --- a/build_windows/VS10/exstl_access.vcxproj +++ b/build_windows/VS10/exstl_access.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -77,7 +77,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -86,7 +86,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/exstl_advancedfeatures.vcxproj b/build_windows/VS10/exstl_advancedfeatures.vcxproj index c96c6264..709516d3 100644 --- a/build_windows/VS10/exstl_advancedfeatures.vcxproj +++ b/build_windows/VS10/exstl_advancedfeatures.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -77,7 +77,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -86,7 +86,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/exstl_repquote.vcxproj b/build_windows/VS10/exstl_repquote.vcxproj index 946d7154..e7b139f7 100644 --- a/build_windows/VS10/exstl_repquote.vcxproj +++ b/build_windows/VS10/exstl_repquote.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -77,7 +77,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -86,7 +86,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/exstl_tpcb.vcxproj b/build_windows/VS10/exstl_tpcb.vcxproj index ce517266..0591025e 100644 --- a/build_windows/VS10/exstl_tpcb.vcxproj +++ b/build_windows/VS10/exstl_tpcb.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -77,7 +77,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -86,7 +86,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/exstl_txnguide.vcxproj b/build_windows/VS10/exstl_txnguide.vcxproj index c5d82bbc..a89463cf 100644 --- a/build_windows/VS10/exstl_txnguide.vcxproj +++ b/build_windows/VS10/exstl_txnguide.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -77,7 +77,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -86,7 +86,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/library.props b/build_windows/VS10/library.props index 05bf71d5..1154ad1b 100644 --- a/build_windows/VS10/library.props +++ b/build_windows/VS10/library.props @@ -2,7 +2,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
- <BDB_VERSION>53</BDB_VERSION>
+ <BDB_VERSION>61</BDB_VERSION>
</PropertyGroup>
<PropertyGroup>
<OutDir>..\..\build_windows\$(Platform)\$(Configuration)\</OutDir>
diff --git a/build_windows/VS10/php_db4.vcxproj b/build_windows/VS10/php_db4.vcxproj index 7c4e9a36..c2f74459 100644 --- a/build_windows/VS10/php_db4.vcxproj +++ b/build_windows/VS10/php_db4.vcxproj @@ -60,7 +60,7 @@ <PreprocessorDefinitions>COMPILE_DL_DB4;DB4_EXPORTS;HAVE_DB_H=1;ZEND_WIN32=1;PHP_WIN32=1;ZEND_WIN32_FORCE_INLINE;ZTS=1;ZEND_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <PreprocessorDefinitions>COMPILE_DL_DB4;DB4_EXPORTS;HAVE_DB_H=1;ZEND_WIN32=1;PHP_WIN32=1;ZEND_WIN32_FORCE_INLINE;ZTS=1;ZEND_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <PreprocessorDefinitions>COMPILE_DL_DB4;DB4_EXPORTS;HAVE_DB_H=1;ZEND_WIN32=1;PHP_WIN32=1;ZEND_WIN32_FORCE_INLINE;ZTS=1;ZEND_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <PreprocessorDefinitions>COMPILE_DL_DB4;DB4_EXPORTS;HAVE_DB_H=1;ZEND_WIN32=1;PHP_WIN32=1;ZEND_WIN32_FORCE_INLINE;ZTS=1;ZEND_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/stl_test.vcxproj b/build_windows/VS10/stl_test.vcxproj index 99feacdf..6da8f3f4 100644 --- a/build_windows/VS10/stl_test.vcxproj +++ b/build_windows/VS10/stl_test.vcxproj @@ -61,7 +61,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -70,7 +70,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -80,7 +80,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -90,7 +90,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/stl_test_msexamples.vcxproj b/build_windows/VS10/stl_test_msexamples.vcxproj index 935eec42..3960524f 100644 --- a/build_windows/VS10/stl_test_msexamples.vcxproj +++ b/build_windows/VS10/stl_test_msexamples.vcxproj @@ -61,7 +61,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -70,7 +70,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -80,7 +80,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -90,7 +90,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/stl_test_stlport.vcxproj b/build_windows/VS10/stl_test_stlport.vcxproj index 61153d82..649342c9 100644 --- a/build_windows/VS10/stl_test_stlport.vcxproj +++ b/build_windows/VS10/stl_test_stlport.vcxproj @@ -61,7 +61,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -70,7 +70,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -80,7 +80,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -90,7 +90,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/test_cutest.vcxproj b/build_windows/VS10/test_cutest.vcxproj index d1bd8929..7d3dfa65 100644 --- a/build_windows/VS10/test_cutest.vcxproj +++ b/build_windows/VS10/test_cutest.vcxproj @@ -96,6 +96,7 @@ <ClCompile Include="..\..\test\c\cutest\CuTest.c"/> <ClCompile Include="..\..\test\c\cutest\CuTests.c"/> <ClCompile Include="..\..\test\c\cutest\Runner.c"/> + <ClCompile Include="..\..\test\c\suites\TestCallbackSetterAndGetter.c"/> <ClCompile Include="..\..\test\c\suites\TestChannel.c"/> <ClCompile Include="..\..\test\c\suites\TestDbHotBackup.c"/> <ClCompile Include="..\..\test\c\suites\TestDbTuner.c"/> @@ -103,7 +104,10 @@ <ClCompile Include="..\..\test\c\suites\TestEnvConfig.c"/> <ClCompile Include="..\..\test\c\suites\TestEnvMethod.c"/> <ClCompile Include="..\..\test\c\suites\TestKeyExistErrorReturn.c"/> + <ClCompile Include="..\..\test\c\suites\TestMutexAlignment.c"/> <ClCompile Include="..\..\test\c\suites\TestPartial.c"/> + <ClCompile Include="..\..\test\c\suites\TestPartition.c"/> + <ClCompile Include="..\..\test\c\suites\TestPreOpenSetterAndGetter.c"/> <ClCompile Include="..\..\test\c\suites\TestQueue.c"/> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> |