[Python-checkins] r64555 - in python/trunk: Lib/bsddb/test/test_replication.py PCbuild/_bsddb.vcproj PCbuild/_bsddb44.vcproj PCbuild/pcbuild.sln PCbuild/pyproject.vsprops Tools/buildbot/external-common.bat

Author: trent.nelson Date: Fri Jun 27 04:30:34 2008 New Revision: 64555 Log: Merged revisions 64368-64369 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/tnelson-trunk-bsddb-47-upgrade ........ r64368 | trent.nelson | 2008-06-17 23:13:44 -0500 (Tue, 17 Jun 2008) | 1 line Initial commit of work pertaining to switching the Windows build from Berkeley DB 4.4.20 to 4.7.25. Note that I've deprecated the standalone '_bsddb44.vcproj' in lieu of adding the sources in a separate folder to the _bsddb project. This was a conscious decision and actually makes everything far more easier to manage. With this approach, entire test suite passed straight off the bat. Well, almost -- the timeout in bsddb/test/test_replication.py needed bumping up a little -- 2 seconds was too short. 10 seconds seems to be fine for me, but I'll make sure Jesus verifies. More documentation to come once I've been able to test out this approach on the buildbots (hence keeping the changes in a separate branch for now). ........ r64369 | trent.nelson | 2008-06-17 23:19:12 -0500 (Tue, 17 Jun 2008) | 1 line Bump Berkeley DB version from 4.4.20 to 4.7.25. ........ Removed: python/trunk/PCbuild/_bsddb44.vcproj Modified: python/trunk/ (props changed) python/trunk/Lib/bsddb/test/test_replication.py python/trunk/PCbuild/_bsddb.vcproj python/trunk/PCbuild/pcbuild.sln python/trunk/PCbuild/pyproject.vsprops python/trunk/Tools/buildbot/external-common.bat Modified: python/trunk/Lib/bsddb/test/test_replication.py ============================================================================== --- python/trunk/Lib/bsddb/test/test_replication.py (original) +++ python/trunk/Lib/bsddb/test/test_replication.py Fri Jun 27 04:30:34 2008 @@ -94,7 +94,7 @@ # The timeout is necessary in BDB 4.5, since DB_EVENT_REP_STARTUPDONE # is not generated if the master has no new transactions. # This is solved in BDB 4.6 (#15542). - timeout = time.time()+2 + timeout = time.time()+10 while (time.time()<timeout) and not (self.confirmed_master and self.client_startupdone) : time.sleep(0.02) if db.version() >= (4,6) : Modified: python/trunk/PCbuild/_bsddb.vcproj ============================================================================== --- python/trunk/PCbuild/_bsddb.vcproj (original) +++ python/trunk/PCbuild/_bsddb.vcproj Fri Jun 27 04:30:34 2008 @@ -43,6 +43,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" /> <Tool Name="VCManagedResourceCompilerTool" @@ -55,6 +56,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" /> <Tool @@ -104,6 +106,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" /> <Tool Name="VCManagedResourceCompilerTool" @@ -167,6 +170,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" /> <Tool Name="VCManagedResourceCompilerTool" @@ -230,6 +234,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" /> <Tool Name="VCManagedResourceCompilerTool" @@ -293,6 +298,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" /> <Tool Name="VCManagedResourceCompilerTool" @@ -356,6 +362,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" /> <Tool Name="VCManagedResourceCompilerTool" @@ -419,6 +426,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" /> <Tool Name="VCManagedResourceCompilerTool" @@ -482,6 +490,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" /> <Tool Name="VCManagedResourceCompilerTool" @@ -540,6 +549,914 @@ > </File> </Filter> + <Filter + Name="Berkeley DB 4.7.25 Source Files" + > + <File + RelativePath="$(bsddbDir)\..\crypto\aes_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_compact.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_compare.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_conv.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_curadj.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_cursor.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_delete.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_open.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_put.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_rec.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_reclaim.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_recno.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_rsearch.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_search.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_split.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_upgrade.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\bt_verify.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\btree\btree_auto.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\crdel_auto.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\crdel_rec.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\crypto\crypto.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_am.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_auto.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\db_byteorder.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_cam.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_cds.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_conv.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_dispatch.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_dup.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\db_err.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\db_getlong.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\db_idspace.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_iface.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_join.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\db_log2.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_meta.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_open.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_overflow.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_ovfl_vrfy.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_pr.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_rec.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_reclaim.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_remove.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_rename.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_ret.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_setid.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_setlsn.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\db_shash.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_stati.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_truncate.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_upg.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_upg_opd.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_vrfy.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\db\db_vrfyutil.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\dbm\dbm.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\dbreg\dbreg.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\dbreg\dbreg_auto.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\dbreg\dbreg_rec.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\dbreg\dbreg_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\dbreg\dbreg_util.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\dbt.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_alloc.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_config.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_failchk.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_file.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_globals.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_name.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_open.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_recover.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_region.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_register.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_sig.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\env\env_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\fileops\fileops_auto.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\fileops\fop_basic.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\fileops\fop_rec.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\fileops\fop_util.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_auto.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_conv.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_dup.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_func.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_meta.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_open.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_page.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_rec.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_reclaim.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_upgrade.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hash\hash_verify.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hmac\hmac.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hsearch\hsearch.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\lock\lock.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\lock\lock_deadlock.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\lock\lock_failchk.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\lock\lock_id.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\lock\lock_list.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\lock\lock_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\lock\lock_region.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\lock\lock_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\lock\lock_timer.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\lock\lock_util.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\log\log.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\log\log_archive.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\log\log_compare.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\log\log_debug.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\log\log_get.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\log\log_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\log\log_put.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\log\log_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\mkpath.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_alloc.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_bh.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_fget.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_fmethod.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_fopen.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_fput.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_fset.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_mvcc.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_region.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_register.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_resize.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_sync.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mp\mp_trickle.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\crypto\mersenne\mt19937db.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mutex\mut_alloc.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mutex\mut_failchk.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mutex\mut_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mutex\mut_region.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mutex\mut_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\mutex\mut_win32.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\openflags.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os\os_abort.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_abs.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os\os_addrinfo.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os\os_alloc.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_clock.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_config.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_cpu.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os\os_ctime.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_dir.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_errno.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_fid.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_flock.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_fsync.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_getenv.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_handle.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_map.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\os_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_mkdir.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_open.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os\os_pid.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_rename.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os\os_root.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os\os_rpath.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_rw.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_seek.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os\os_stack.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os\os_tmpdir.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_truncate.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os\os_uid.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_unlink.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\os_windows\os_yield.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\qam\qam.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\qam\qam_auto.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\qam\qam_conv.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\qam\qam_files.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\qam\qam_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\qam\qam_open.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\qam\qam_rec.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\qam\qam_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\qam\qam_upgrade.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\qam\qam_verify.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\rep\rep_auto.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\rep\rep_backup.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\rep\rep_elect.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\rep\rep_lease.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\rep\rep_log.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\rep\rep_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\rep\rep_record.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\rep\rep_region.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\rep\rep_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\rep\rep_util.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\rep\rep_verify.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\repmgr\repmgr_auto.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\repmgr\repmgr_elect.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\repmgr\repmgr_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\repmgr\repmgr_msg.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\repmgr\repmgr_net.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\repmgr\repmgr_queue.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\repmgr\repmgr_sel.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\repmgr\repmgr_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\repmgr\repmgr_util.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\repmgr\repmgr_windows.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\crypto\rijndael\rijndael-alg-fst.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\crypto\rijndael\rijndael-api-fst.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\sequence\seq_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\sequence\sequence.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\hmac\sha1.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\clib\strsep.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\txn\txn.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\txn\txn_auto.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\txn\txn_chkpt.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\txn\txn_failchk.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\txn\txn_method.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\txn\txn_rec.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\txn\txn_recover.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\txn\txn_region.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\txn\txn_stat.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\txn\txn_util.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\util_cache.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\util_log.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\util_sig.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\xa\xa.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\xa\xa_db.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\xa\xa_map.c" + > + </File> + <File + RelativePath="$(bsddbDir)\..\common\zerofill.c" + > + </File> + </Filter> </Files> <Globals> </Globals> Deleted: python/trunk/PCbuild/_bsddb44.vcproj ============================================================================== --- python/trunk/PCbuild/_bsddb44.vcproj Fri Jun 27 04:30:34 2008 +++ (empty file) @@ -1,1252 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="_bsddb44" - ProjectGUID="{62172C7D-B39E-409A-B352-370FF5098C19}" - RootNamespace="_bsddb44" - Keyword="Win32Proj" - TargetFrameworkVersion="196613" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\pyd_d.vsprops" - CharacterSet="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.." - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|x64" - ConfigurationType="4" - InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" - CharacterSet="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.." - PreprocessorDefinitions="DIAGNOSTIC" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\pyd.vsprops" - CharacterSet="0" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.." - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|x64" - ConfigurationType="4" - InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" - CharacterSet="0" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.." - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="PGInstrument|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" - CharacterSet="0" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.." - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="PGInstrument|x64" - ConfigurationType="4" - InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" - CharacterSet="0" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.." - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="PGUpdate|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" - CharacterSet="0" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.." - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="PGUpdate|x64" - ConfigurationType="4" - InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" - CharacterSet="0" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.." - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - > - <File - RelativePath="$(bsddbDir)\..\btree\bt_compact.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_compare.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_conv.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_curadj.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_cursor.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_delete.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_method.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_open.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_put.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_rec.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_reclaim.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_recno.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_rsearch.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_search.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_split.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_upgrade.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\bt_verify.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\btree\btree_auto.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\crdel_auto.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\crdel_rec.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\common\crypto_stub.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_am.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_auto.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\common\db_byteorder.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_cam.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\common\db_clock.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_conv.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_dispatch.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_dup.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\common\db_err.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\common\db_getlong.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\common\db_idspace.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_iface.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_join.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\common\db_log2.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_meta.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_method.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_open.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_overflow.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_ovfl_vrfy.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_pr.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_rec.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_reclaim.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_remove.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_rename.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_ret.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\env\db_salloc.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_setid.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_setlsn.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\env\db_shash.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_stati.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_truncate.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_upg.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_upg_opd.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_vrfy.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\db\db_vrfyutil.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\dbm\dbm.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\dbreg\dbreg.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\dbreg\dbreg_auto.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\dbreg\dbreg_rec.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\dbreg\dbreg_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\dbreg\dbreg_util.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\env\env_failchk.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\env\env_file.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\env\env_method.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\env\env_open.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\env\env_recover.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\env\env_region.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\env\env_register.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\env\env_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\fileops\fileops_auto.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\fileops\fop_basic.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\fileops\fop_rec.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\fileops\fop_util.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_auto.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_conv.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_dup.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_func.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_meta.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_method.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_open.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_page.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_rec.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_reclaim.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_upgrade.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hash\hash_verify.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hmac\hmac.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hsearch\hsearch.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\lock\lock.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\lock\lock_deadlock.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\lock\lock_failchk.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\lock\lock_id.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\lock\lock_list.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\lock\lock_method.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\lock\lock_region.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\lock\lock_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\lock\lock_timer.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\lock\lock_util.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\log\log.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\log\log_archive.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\log\log_compare.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\log\log_debug.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\log\log_get.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\log\log_method.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\log\log_put.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\log\log_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_alloc.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_bh.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_fget.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_fmethod.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_fopen.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_fput.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_fset.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_method.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_region.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_register.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_sync.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mp\mp_trickle.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mutex\mut_alloc.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mutex\mut_method.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mutex\mut_region.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mutex\mut_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\mutex\mut_win32.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_abs.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os\os_alloc.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_clock.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_config.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_dir.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_errno.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_fid.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_flock.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_fsync.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_handle.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os\os_id.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_map.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os\os_method.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os\os_mkdir.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os\os_oflags.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_open.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os\os_region.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_rename.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os\os_root.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os\os_rpath.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_rw.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_seek.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_sleep.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_spin.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os\os_tmpdir.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_truncate.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\os_win32\os_unlink.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\qam\qam.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\qam\qam_auto.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\qam\qam_conv.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\qam\qam_files.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\qam\qam_method.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\qam\qam_open.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\qam\qam_rec.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\qam\qam_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\qam\qam_upgrade.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\qam\qam_verify.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\rep\rep_auto.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\rep\rep_backup.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\rep\rep_elect.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\rep\rep_log.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\rep\rep_method.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\rep\rep_record.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\rep\rep_region.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\rep\rep_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\rep\rep_util.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\rep\rep_verify.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\sequence\seq_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\sequence\sequence.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\hmac\sha1.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\clib\strcasecmp.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\txn\txn.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\txn\txn_auto.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\txn\txn_chkpt.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\txn\txn_failchk.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\txn\txn_method.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\txn\txn_rec.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\txn\txn_recover.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\txn\txn_region.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\txn\txn_stat.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\txn\txn_util.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\common\util_cache.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\common\util_log.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\common\util_sig.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\xa\xa.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\xa\xa_db.c" - > - </File> - <File - RelativePath="$(bsddbDir)\..\xa\xa_map.c" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Modified: python/trunk/PCbuild/pcbuild.sln ============================================================================== --- python/trunk/PCbuild/pcbuild.sln (original) +++ python/trunk/PCbuild/pcbuild.sln Fri Jun 27 04:30:34 2008 @@ -41,7 +41,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" ProjectSection(ProjectDependencies) = postProject {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} - {62172C7D-B39E-409A-B352-370FF5098C19} = {62172C7D-B39E-409A-B352-370FF5098C19} {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject @@ -121,11 +120,6 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb44", "_bsddb44.vcproj", "{62172C7D-B39E-409A-B352-370FF5098C19}" - ProjectSection(ProjectDependencies) = postProject - {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" ProjectSection(ProjectDependencies) = postProject {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} @@ -510,22 +504,6 @@ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|Win32.Build.0 = Release|Win32 {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.ActiveCfg = Release|x64 {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.Build.0 = Release|x64 - {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.ActiveCfg = Debug|Win32 - {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.Build.0 = Debug|Win32 - {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.ActiveCfg = Debug|x64 - {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.Build.0 = Debug|x64 - {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 - {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 - {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 - {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.Build.0 = PGInstrument|x64 - {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 - {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 - {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 - {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.Build.0 = PGUpdate|x64 - {62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.ActiveCfg = Release|Win32 - {62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.Build.0 = Release|Win32 - {62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.ActiveCfg = Release|x64 - {62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.Build.0 = Release|x64 {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.ActiveCfg = Debug|Win32 {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.Build.0 = Debug|Win32 {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.ActiveCfg = Debug|x64 Modified: python/trunk/PCbuild/pyproject.vsprops ============================================================================== --- python/trunk/PCbuild/pyproject.vsprops (original) +++ python/trunk/PCbuild/pyproject.vsprops Fri Jun 27 04:30:34 2008 @@ -50,11 +50,11 @@ /> <UserMacro Name="bsddbDir" - Value="$(bsddb44Dir)" + Value="$(bsddb47Dir)" /> <UserMacro Name="bsddbDepLibs" - Value="$(bsddb44DepLibs)" + Value="$(bsddb47DepLibs)" /> <UserMacro Name="bsddb44Dir" @@ -65,11 +65,11 @@ Value="" /> <UserMacro - Name="bsddb45Dir" - Value="$(externalsDir)\db-4.5.20.x\build_windows" + Name="bsddb47Dir" + Value="$(externalsDir)\db-4.7.25.0\build_windows" /> <UserMacro - Name="bsddb45DepLibs" + Name="bsddb47DepLibs" Value="ws2_32.lib" /> <UserMacro Modified: python/trunk/Tools/buildbot/external-common.bat ============================================================================== --- python/trunk/Tools/buildbot/external-common.bat (original) +++ python/trunk/Tools/buildbot/external-common.bat Fri Jun 27 04:30:34 2008 @@ -14,6 +14,7 @@ @rem if exist tk8.4.16 rd /s/q tk8.4.16 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1 @rem if exist db-4.4.20 rd /s/q db-4.4.20 +@rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0 @rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g @rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9 @@ -23,8 +24,9 @@ svn export http://svn.python.org/projects/external/bzip2-1.0.5 ) -@rem Sleepycat db -if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20 +@rem Berkeley DB +if exist db-4.4.20 rd /s/q db-4.4.20 +if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0 @rem OpenSSL if not exist openssl-0.9.8g svn export http://svn.python.org/projects/external/openssl-0.9.8g