Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master

7 files changed, 277 insertions, 16 deletions

diff --git a/dist/win_projects/db.projects b/dist/win_projects/db.projects
index a933539c..0773eadb 100644
--- a/dist/win_projects/db.projects
+++ b/dist/win_projects/db.projects
@@ -14,6 +14,7 @@ db_printlog
 db_recover
 db_replicate
 db_repsite
+db_reptest
 db_small
 db_sql
 db_sql_codegen
@@ -29,6 +30,7 @@ db_tuner
 db_upgrade
 db_verify
 ex_access
+ex_blob
 ex_btrec
 ex_bulk
 ex_csvcode
@@ -61,6 +63,7 @@ example_database_load
 example_database_read
 excxx_access
 excxx_btrec
+excxx_bulk
 excxx_env
 excxx_example_database_load
 excxx_example_database_read
diff --git a/dist/win_projects/db_wince.projects b/dist/win_projects/db_wince.projects
index 69ffc650..ccd36a8d 100644
--- a/dist/win_projects/db_wince.projects
+++ b/dist/win_projects/db_wince.projects
@@ -1,5 +1,19 @@
 db_small
 db
+db_archive
+db_checkpoint
+db_deadlock
+db_dump
+db_hotbackup
+db_load
+db_log_verify
+db_printlog
 db_sql
+db_recover
+db_replicate
+db_stat
+db_tuner
+db_upgrade
+db_verify
 wce_sql
 wce_tpcb
diff --git a/dist/win_projects/genproject.template b/dist/win_projects/genproject.template
index faf8dd96..8dbfbdad 100644
--- a/dist/win_projects/genproject.template
+++ b/dist/win_projects/genproject.template
@@ -60,6 +60,12 @@ declare function local:isRelease($config) as xs:boolean
   contains($config,"Release")
 };
 
+(: whether use WinMainCRTStartup as EntryPoint :)
+declare function local:isWinMain($project) as xs:boolean
+{
+  contains($project/configuration/text(),"WinMain")
+};
+
 declare function local:characterSet()
 {
   if ($mobile) then "1" else "2"
@@ -297,8 +303,9 @@ local:indent(6),<Tool>
   {local:makeImportLibrary($project,$config)}
   {local:makeModuleDefinition($project,$config)}
   {attribute{"TargetMachine"}{if (contains($platform, "(ARMV4)")) then "3" else "0"}}
+  {if ($mobile) then (attribute{"SubSystem"}{"9"}) else ()}
   {if ($project/type eq "app" and $mobile) then 
-      (attribute{"SubSystem"}{"9"},attribute{"EntryPointSymbol"}{"WinMainCRTStartup"})
+      (attribute{"EntryPointSymbol"}{if (local:isWinMain($project)) then "WinMainCRTStartup" else "mainACRTStartup"})
    else ()}
 </Tool>
 };
diff --git a/dist/win_projects/projects.template.xml b/dist/win_projects/projects.template.xml
index b798fc65..c24083f2 100644
--- a/dist/win_projects/projects.template.xml
+++ b/dist/win_projects/projects.template.xml
@@ -143,7 +143,7 @@
     </platform>
   </library>
   <library name="tcl">
-    <libname config="Debug">tcl85g</libname>
+    <libname config="Debug">tcl85</libname>
     <libname config="Release">tcl85</libname>
     <platform name="Win32 x64">
       <config type="Debug">
@@ -189,6 +189,10 @@
 <!--    <preprocessor config="Static Debug">DIAGNOSTIC</preprocessor>  -->
     <files>
       <file name="src/crypto/aes_method.c"/>
+      <file name="src/blob/blob_fileops.c"/>
+      <file name="src/blob/blob_page.c"/>
+      <file name="src/blob/blob_stream.c"/>
+      <file name="src/blob/blob_util.c"/>
       <file name="src/btree/bt_compact.c"/>
       <file name="src/btree/bt_compare.c"/>
       <file name="src/btree/bt_compress.c"/>
@@ -215,6 +219,7 @@
       <file name="lang/cxx/cxx_channel.cpp"/>
       <file name="lang/cxx/cxx_db.cpp"/>
       <file name="lang/cxx/cxx_dbc.cpp"/>
+      <file name="lang/cxx/cxx_dbstream.cpp"/>
       <file name="lang/cxx/cxx_dbt.cpp"/>
       <file name="lang/cxx/cxx_env.cpp"/>
       <file name="lang/cxx/cxx_except.cpp"/>
@@ -309,7 +314,6 @@
       <file name="src/hash/hash_verify.c"/>
       <file name="src/heap/heap.c"/>
       <file name="src/heap/heap_auto.c"/>
-      <file name="src/heap/heap_autop.c"/>
       <file name="src/heap/heap_backup.c"/>
       <file name="src/heap/heap_conv.c"/>
       <file name="src/heap/heap_method.c"/>
@@ -317,6 +321,7 @@
       <file name="src/heap/heap_rec.c"/>
       <file name="src/heap/heap_reclaim.c"/>
       <file name="src/heap/heap_stat.c"/>
+      <file name="src/heap/heap_upgrade.c"/>
       <file name="src/heap/heap_verify.c"/>
       <file name="src/hmac/hmac.c"/>
       <file name="lang/hsearch/hsearch.c"/>
@@ -389,6 +394,7 @@
       <file name="src/os_windows/os_map.c"/>
       <file name="src/os_windows/os_mkdir.c"/>
       <file name="src/os_windows/os_open.c"/>
+      <file name="src/os_windows/os_rmdir.c"/>
       <file name="src/os/os_path.c"/>
       <file name="src/os/os_pid.c"/>
       <file name="src/os_windows/os_rename.c"/>
@@ -475,6 +481,10 @@
     <preprocessor config="all">_UNICODE;UNICODE;HAVE_SMALLBUILD</preprocessor>
     <preprocessor config="dll">DB_CREATE_DLL</preprocessor>
     <files>
+      <file name="src\blob\blob_fileops.c"/>
+      <file name="src\blob\blob_page.c"/>
+      <file name="src\blob\blob_stream.c"/>
+      <file name="src\blob\blob_util.c"/>
       <file name="src\btree\bt_compact.c"/>
       <file name="src\btree\bt_compare.c"/>
       <file name="src\btree\bt_conv.c"/>
@@ -513,6 +523,7 @@
       <file name="lang\cxx\cxx_channel.cpp"/>
       <file name="lang\cxx\cxx_db.cpp"/>
       <file name="lang\cxx\cxx_dbc.cpp"/>
+      <file name="lang\cxx\cxx_dbstream.cpp"/>
       <file name="lang\cxx\cxx_dbt.cpp"/>
       <file name="lang\cxx\cxx_env.cpp"/>
       <file name="lang\cxx\cxx_except.cpp"/>
@@ -649,6 +660,7 @@
       <file name="src\os_windows\os_map.c"/>
       <file name="src\os_windows\os_mkdir.c"/>
       <file name="src\os_windows\os_open.c"/>
+      <file name="src/os_windows/os_rmdir.c"/>
       <file name="src\os\os_path.c"/>
       <file name="src\os_windows\os_rename.c"/>
       <file name="src\os_windows\os_rw.c"/>
@@ -721,7 +733,9 @@
       <file name="lang\sql\sqlite\ext\fts3\fts3_icu.c"/>
       <file name="lang\sql\sqlite\ext\fts3\fts3_porter.c"/>
       <file name="lang\sql\sqlite\ext\fts3\fts3_snippet.c"/>
+      <file name="lang\sql\sqlite\ext\fts3\fts3_term.c"/>
       <file name="lang\sql\sqlite\ext\fts3\fts3_tokenizer1.c"/>
+      <file name="lang\sql\sqlite\ext\fts3\fts3_tokenize_vtab.c"/>
       <file name="lang\sql\sqlite\ext\fts3\fts3_tokenizer.c"/>
       <file name="lang\sql\sqlite\ext\fts3\fts3_write.c"/>
       <file name="lang\sql\sqlite\src\func.c"/>
@@ -769,6 +783,7 @@
       <file name="lang\sql\sqlite\src\vdbeaux.c"/>
       <file name="lang\sql\sqlite\src\vdbeblob.c"/>
       <file name="lang\sql\sqlite\src\vdbemem.c"/>
+      <file name="lang\sql\sqlite\src\vdbesort.c"/>
       <file name="lang\sql\sqlite\src\vdbetrace.c"/>
       <file name="lang\sql\sqlite\src\vtab.c"/>
       <file name="lang\sql\adapter\wal.c"/>
@@ -787,11 +802,12 @@
       <command config="ReleaseDebug">
 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>
     </event>
     <preprocessor config="all">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</preprocessor>
@@ -859,6 +875,7 @@ echo JDBC build finished</command>
       <file name="lang/tcl/tcl_db.c"/>
       <file name="lang/tcl/tcl_db_pkg.c"/>
       <file name="lang/tcl/tcl_dbcursor.c"/>
+      <file name="lang/tcl/tcl_dbstream.c"/>
       <file name="lang/tcl/tcl_env.c"/>
       <file name="lang/tcl/tcl_internal.c"/>
       <file name="lang/tcl/tcl_lock.c"/>
@@ -884,14 +901,15 @@ echo JDBC build finished</command>
       <command config="ReleaseDebug">
 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>
       <output>force_compilation.txt</output>
     </event>
@@ -907,6 +925,7 @@ echo Java build finished</command>
     <include type="ref">all</include>
     <options><nowp64/></options>
     <preprocessor config="all">DB_CREATE_DLL;_UNICODE;UNICODE</preprocessor>
+    <preprocessor config="Debug">CONFIG_TEST</preprocessor>
     <files>
       <file name="lang/csharp/libdb_csharp/db_csharp_wrap.c"/>
     </files>
@@ -1031,6 +1050,7 @@ echo Java build finished</command>
       <file name="src/dbreg/dbreg_autop.c"/>
       <file name="src/fileops/fileops_autop.c"/>
       <file name="src/hash/hash_autop.c"/>
+      <file name="src/heap/heap_autop.c"/>
       <file name="src/qam/qam_autop.c"/>
       <file name="src/repmgr/repmgr_autop.c"/>
       <file name="src/txn/txn_autop.c"/>
@@ -1069,6 +1089,20 @@ echo Java build finished</command>
       <file name="src/clib/getopt.c"/>
     </files>
   </project>
+  <project name="db_reptest" guid="{4786F27F-FF38-42e8-87C1-CC3B6E544C5D}">
+    <type>app</type>
+    <configuration></configuration>
+    <depends>db</depends>
+    <include type="ref">all</include>
+    <files>
+      <file name="test/repmgr/db_reptest.c"/>
+      <file name="test/repmgr/reptest_am.c"/>
+      <file name="test/repmgr/reptest_handles.c"/>
+      <file name="test/repmgr/reptest_spawn.c"/>
+      <file name="test/repmgr/reptest_util.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project>
   <project name="db_sql_shell" guid="A5DB89F0-06E5-11DF-8A39-0800200C9A66" output="dbsql">
     <type>app</type>
     <configuration></configuration>
@@ -1122,9 +1156,25 @@ echo Java build finished</command>
       <file name="lang\sql\sqlite\ext\fts3\fts3_icu.c"/>
       <file name="lang\sql\sqlite\ext\fts3\fts3_porter.c"/>
       <file name="lang\sql\sqlite\ext\fts3\fts3_snippet.c"/>
+      <file name="lang\sql\sqlite\ext\fts3\fts3_term.c"/>
+      <file name="lang\sql\sqlite\ext\fts3\fts3_test.c"/>
       <file name="lang\sql\sqlite\ext\fts3\fts3_tokenizer1.c"/>
       <file name="lang\sql\sqlite\ext\fts3\fts3_tokenizer.c"/>
+      <file name="lang\sql\sqlite\ext\fts3\fts3_tokenize_vtab.c"/>
       <file name="lang\sql\sqlite\ext\fts3\fts3_write.c"/>
+      <file name="lang\sql\sqlite\ext\misc\amatch.c"/>
+      <file name="lang\sql\sqlite\ext\misc\closure.c"/>
+      <file name="lang\sql\sqlite\ext\misc\fuzzer.c"/>
+      <file name="lang\sql\sqlite\ext\misc\ieee754.c"/>
+      <file name="lang\sql\sqlite\ext\misc\nextchar.c"/>
+      <file name="lang\sql\sqlite\ext\misc\percentile.c"/>
+      <file name="lang\sql\sqlite\ext\misc\regexp.c"/>
+      <file name="lang\sql\sqlite\ext\misc\rot13.c"/>
+      <file name="lang\sql\sqlite\ext\misc\spellfix.c"/>
+      <file name="lang\sql\sqlite\ext\misc\totype.c"/>
+      <file name="lang\sql\sqlite\ext\misc\vfslog.c"/>
+      <file name="lang\sql\sqlite\ext\misc\vtshim.c"/>
+      <file name="lang\sql\sqlite\ext\misc\wholenumber.c"/>
       <file name="lang\sql\sqlite\src\func.c"/>
       <file name="lang\sql\sqlite\src\global.c"/>
       <file name="lang\sql\sqlite\src\hash.c"/>
@@ -1172,6 +1222,7 @@ echo Java build finished</command>
       <file name="lang\sql\sqlite\src\vdbeaux.c"/>
       <file name="lang\sql\sqlite\src\vdbeblob.c"/>
       <file name="lang\sql\sqlite\src\vdbemem.c"/>
+      <file name="lang\sql\sqlite\src\vdbesort.c"/>
       <file name="lang\sql\sqlite\src\vdbetrace.c"/>
       <file name="lang\sql\sqlite\src\vtab.c"/>
       <file name="lang\sql\adapter\wal.c"/>
@@ -1195,8 +1246,8 @@ echo Java build finished</command>
       <file name="lang\sql\sqlite\src\test_config.c"/>
       <file name="lang\sql\sqlite\src\test_demovfs.c"/>
       <file name="lang\sql\sqlite\src\test_devsym.c"/>
+      <file name="lang\sql\sqlite\src\test_fs.c"/>
       <file name="lang\sql\sqlite\src\test_func.c"/>
-      <file name="lang\sql\sqlite\src\test_fuzzer.c"/>
       <file name="lang\sql\sqlite\src\test_hexio.c"/>
       <file name="lang\sql\sqlite\src\test_intarray.c"/>
       <file name="lang\sql\sqlite\src\test_journal.c"/>
@@ -1218,7 +1269,6 @@ echo Java build finished</command>
       <file name="lang\sql\sqlite\src\test_thread.c"/>
       <file name="lang\sql\sqlite\src\test_vfs.c"/>
       <file name="lang\sql\sqlite\src\test_vfstrace.c"/>
-      <file name="lang\sql\sqlite\src\test_wholenumber.c"/>
       <file name="lang\sql\sqlite\src\test_wsd.c"/>
     </files>
   </project>
@@ -1311,6 +1361,17 @@ echo Java build finished</command>
       <file name="examples/c/ex_access.c"/>
     </files>
   </project>
+  <project name="ex_blob" guid="0460962E-97E3-40fd-B3CD-702085F2FC98">
+    <type>app</type>
+    <configuration></configuration>
+    <depends>db</depends>
+    <references>db</references>
+    <include type="ref">all</include>
+    <files>
+      <file name="src/clib/getopt.c"/>
+      <file name="examples/c/ex_blob.c"/>
+    </files>
+  </project>
   <project name="ex_btrec" guid="5DD66F4B-EB4A-4453-BC31-3FF7B2240634">
     <type>app</type>
     <configuration></configuration>
@@ -1413,9 +1474,10 @@ echo Java build finished</command>
       <command config="ReleaseDebug">
 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>
       <output>force_compilation.txt</output>
     </event>
@@ -1583,6 +1645,17 @@ echo Java example build finished</command>
       <file name="examples/cxx/BtRecExample.cpp"/>
     </files>
   </project>
+  <project name="excxx_bulk" guid="5AEBE8D9-4B6D-46AA-B810-30CD7E6BBD5F">
+    <type>app</type>
+    <configuration></configuration>
+    <depends>db</depends>
+    <references>db</references>
+    <include type="ref">all</include>
+    <files>
+      <file name="src/clib/getopt.c"/>
+      <file name="examples/cxx/BulkExample.cpp"/>
+    </files>
+  </project>
   <project name="excxx_env" guid="E790C029-341D-489B-B987-D35947AD78C3">
     <type>app</type>
     <configuration></configuration>
@@ -1985,6 +2058,7 @@ echo Java example build finished</command>
       <file name="test/c/cutest/CuTest.c"/>
       <file name="test/c/cutest/CuTests.c"/>
       <file name="test/c/cutest/Runner.c"/>
+     <file name="test/c/suites/TestCallbackSetterAndGetter.c"/>
       <file name="test/c/suites/TestChannel.c"/>
       <file name="test/c/suites/TestDbHotBackup.c"/>
       <file name="test/c/suites/TestDbTuner.c"/>
@@ -1992,7 +2066,10 @@ echo Java example build finished</command>
       <file name="test/c/suites/TestEnvConfig.c"/>
       <file name="test/c/suites/TestEnvMethod.c"/>
       <file name="test/c/suites/TestKeyExistErrorReturn.c"/>
+      <file name="test/c/suites/TestMutexAlignment.c"/>
       <file name="test/c/suites/TestPartial.c"/>
+      <file name="test/c/suites/TestPartition.c"/>
+      <file name="test/c/suites/TestPreOpenSetterAndGetter.c"/>
       <file name="test/c/suites/TestQueue.c"/>
     </files> 
   </project>
diff --git a/dist/win_projects/projects_csharp.template.xml b/dist/win_projects/projects_csharp.template.xml
index c73489bc..f9c5728c 100644
--- a/dist/win_projects/projects_csharp.template.xml
+++ b/dist/win_projects/projects_csharp.template.xml
@@ -35,6 +35,8 @@
       <file name="CompactData.cs" />
       <file name="MultipleKeyDatabaseEntry.cs" />
       <file name="DatabaseEntry.cs" />
+      <file name="DatabaseStream.cs" />
+      <file name="DatabaseStreamConfig.cs" />
       <file name="DbChannel.cs" />
       <file name="DbSite.cs" />
       <file name="DbSiteConfig.cs" />
@@ -114,6 +116,7 @@
       <file name="Internal\DB_LSN.cs" />
       <file name="Internal\db_recops.cs" />
       <file name="Internal\DB_SITE.cs" />
+      <file name="Internal\DB_STREAM.cs" />
       <file name="Internal\DB_TXN.cs" />
       <file name="Internal\DB_TXN_TOKEN.cs" />
       <file name="Internal\Delegates.cs" />
diff --git a/dist/win_projects/projects_wince.template.xml b/dist/win_projects/projects_wince.template.xml
index 7a9cc337..d3f79ef9 100644
--- a/dist/win_projects/projects_wince.template.xml
+++ b/dist/win_projects/projects_wince.template.xml
@@ -63,6 +63,10 @@
     <preprocessor config="Debug">DIAGNOSTIC;CONFIG_TEST</preprocessor>
     <preprocessor config="Static Debug">DIAGNOSTIC;</preprocessor>
     <files>
+      <file name="src\blob\blob_fileops.c"/>
+      <file name="src\blob\blob_page.c"/>
+      <file name="src\blob\blob_stream.c"/>
+      <file name="src\blob\blob_util.c"/>
       <file name="src\btree\bt_compact.c"/>
       <file name="src\btree\bt_compare.c"/>
       <file name="src\btree\bt_conv.c"/>
@@ -204,6 +208,7 @@
       <file name="src\log\log_debug.c"/>
       <file name="src\log\log_get.c"/>
       <file name="src\log\log_method.c"/>
+      <file name="src\log\log_print.c"/>
       <file name="src\log\log_put.c"/>
       <file name="src\log\log_stat.c"/>
       <file name="src\log\log_verify.c"/>
@@ -242,6 +247,11 @@
       <file name="src\os\os_tmpdir.c"/>
       <file name="src\os\os_uid.c"/>
       <file name="src\os_windows\ce_ctime.c"/>
+      <file name="src\os_windows\ce_freopen.c"/>
+      <file name="src\os_windows\ce_gmtime.c"/>
+      <file name="src\os_windows\ce_mktime.c"/>
+      <file name="src\os_windows\ce_remove.c"/>
+      <file name="src\os_windows\ce_util_sig.c"/>
       <file name="src\os_windows\os_abs.c"/>
       <file name="src\os_windows\os_clock.c"/>
       <file name="src\os_windows\os_config.c"/>
@@ -257,6 +267,7 @@
       <file name="src\os_windows\os_mkdir.c"/>
       <file name="src\os_windows\os_open.c"/>
       <file name="src\os_windows\os_rename.c"/>
+      <file name="src\os_windows\os_rmdir.c"/>
       <file name="src\os_windows\os_rw.c"/>
       <file name="src\os_windows\os_seek.c"/>
       <file name="src\os_windows\os_stat.c"/>
@@ -299,6 +310,10 @@
     <preprocessor config="Debug">DIAGNOSTIC</preprocessor>
     <preprocessor config="Static Debug">DIAGNOSTIC</preprocessor>
     <files>
+      <file name="src\blob\blob_fileops.c"/>
+      <file name="src\blob\blob_page.c"/>
+      <file name="src\blob\blob_stream.c"/>
+      <file name="src\blob\blob_util.c"/>
       <file name="src\btree\bt_compact.c"/>
       <file name="src\btree\bt_compare.c"/>
       <file name="src\btree\bt_conv.c"/>
@@ -462,6 +477,7 @@
       <file name="src\os_windows\os_mkdir.c"/>
       <file name="src\os_windows\os_open.c"/>
       <file name="src\os_windows\os_rename.c"/>
+      <file name="src\os_windows\os_rmdir.c"/>
       <file name="src\os_windows\os_rw.c"/>
       <file name="src\os_windows\os_seek.c"/>
       <file name="src\os_windows\os_stat.c"/>
@@ -562,6 +578,7 @@
       <file name="lang\sql\sqlite\src\vdbeaux.c"/>
       <file name="lang\sql\sqlite\src\vdbeblob.c"/>
       <file name="lang\sql\sqlite\src\vdbemem.c"/>
+      <file name="lang\sql\sqlite\src\vdbesort.c"/>
       <file name="lang\sql\sqlite\src\vdbetrace.c"/>
       <file name="lang\sql\sqlite\src\vtab.c"/>
       <file name="lang\sql\adapter\wal.c"/>
@@ -569,11 +586,151 @@
       <file name="lang\sql\sqlite\src\where.c"/>
     </files>
   </project>
+
+  <!-- Utilities -->
+  <project name="db_archive" guid="56056344-53A1-4FA6-B20B-862C0BA68953">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+       <file name="util/db_archive.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project>
+  <project name="db_checkpoint" guid="A3BE0163-1E6C-4235-9B6B-3A36ABB5E285">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_checkpoint.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project>
+  <project name="db_deadlock" guid="CD0FD995-B4D1-4907-987B-99CF3304E7E0">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_deadlock.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project>
+  <project name="db_dump" guid="DB067D2C-7163-428B-AAF8-642316AB173B">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_dump.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project>
+  <project name="db_hotbackup" guid="67C0DABC-353A-491F-9A77-8E2E601ED52B">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_hotbackup.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project>
+  <project name="db_load" guid="7640133F-4AB8-42DA-ADB5-95F21447F7D5">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_load.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project>
+  <project name="db_log_verify" guid="872961A3-877A-4B53-886D-F1FB65073608">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_log_verify.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project>
+  <project name="db_printlog" guid="D505F51B-2B92-4850-A08F-9113D947FF4B">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_printlog.c"/>
+      <file name="src/btree/btree_autop.c"/>
+      <file name="src/db/crdel_autop.c"/>
+      <file name="src/db/db_autop.c"/>
+      <file name="src/dbreg/dbreg_autop.c"/>
+      <file name="src/fileops/fileops_autop.c"/>
+      <file name="src/hash/hash_autop.c"/>
+      <file name="src/heap/heap_autop.c"/>
+      <file name="src/qam/qam_autop.c"/>
+      <file name="src/repmgr/repmgr_autop.c"/>
+      <file name="src/txn/txn_autop.c"/>
+      <file name="src/clib/getopt.c"/>
+      <file name="src/os_windows/ce_localtime.c"/>
+    </files>
+  </project>
+  <project name="db_recover" guid="9E03FD51-E387-4EEF-9EEA-E71707A56212">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_recover.c"/>
+      <file name="src/clib/getopt.c"/>
+      <file name="src/os_windows/ce_localtime.c"/>
+    </files>
+  </project>
+  <project name="db_replicate" guid="2AA9FB16-F1B0-47A7-AE10-7830E4E317E2">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_replicate.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project>
+  <project name="db_stat" guid="19D3A4CB-1C12-43D4-A94B-D2B387AD43E5">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_stat.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project>
+  <project name="db_tuner" guid="A86208B6-BEEB-11DF-BCF9-116EDFD72085">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_tuner.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project>
+  <project name="db_upgrade" guid="5F4D66DB-8D75-43D4-A1BB-60A01BC6B32F">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_upgrade.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project>
+  <project name="db_verify" guid="12E118CA-CAAE-4F54-AE81-8D9981AA0635">
+    <type>app</type>
+    <configuration></configuration>
+    <include type="ref">all</include>
+    <files>
+      <file name="util/db_verify.c"/>
+      <file name="src/clib/getopt.c"/>
+    </files>
+  </project> 
   
   <!-- Applications -->
   <project name="wce_sql" guid="75DF98AA-25DF-4183-A022-024CF918480D">
     <type>app</type>
-    <configuration></configuration>
+    <configuration>WinMain</configuration>
     <include type="ref">all</include>
     <include type="ref">sql_app</include>
     <files>
@@ -591,7 +748,7 @@
   
   <project name="wce_tpcb" guid="F2CE670A-ABAE-414A-9A17-8079AB58613F">
     <type>app</type>
-    <configuration></configuration>
+    <configuration>WinMain</configuration>
     <include type="ref">all</include>
     <files>
       <file name="examples/cxx/wce_tpcb/TpcbExample.cpp"/>
diff --git a/dist/win_projects/vs2010.template b/dist/win_projects/vs2010.template
index a6165afe..d3305474 100644
--- a/dist/win_projects/vs2010.template
+++ b/dist/win_projects/vs2010.template
@@ -479,7 +479,7 @@ declare function local:generateRcFilesNoFilter($project)
   for $file in $project/files//file return
        if (ends-with($file/@name,".rc")) then
 	    (local:indent(2),<ItemGroup xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	       {local:indent(4)}<ResourceCompile Include="../{substring-after($file/@name,"/")}">
+	       {local:indent(4)}<ResourceCompile Include="{local:windowsPath(concat($sourcePath,$file/@name))}">
 	       {for $platform in local:getPlatforms($vsversion) return
 	          for $config in local:getConfiguration($project) return(
 		    local:indent(6), <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=={concat("'",$config,"|",$platform,"'")}">{concat(if ($config="Debug") then "_DEBUG" else "NDEBUG",";","$(NoInherit))",";%(PreprocessorDefinitions)")}</PreprocessorDefinitions>)