[Python-checkins] python/dist/src/PCbuild python20.wse,1.106,1.107 readme.txt,1.29,1.30

tim_one@users.sourceforge.net tim_one@users.sourceforge.net
Fri, 22 Nov 2002 19:49:10 -0800


Update of /cvsroot/python/python/dist/src/PCbuild
In directory sc8-pr-cvs1:/tmp/cvs-serv16322/python/PCbuild

Modified Files:
	python20.wse readme.txt 
Log Message:
More bsddb-on-Windows fiddling:
+ News blurb, but as much XXX as news.
+ Updated installer (install the new bsddb package, and the Berkeley DLL;
  still don't know how to fold that into _bsddb.pyd).
+ Fleshed out build instructions.
+ Debug Python still blows up.


Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** python20.wse	19 Nov 2002 17:38:26 -0000	1.106
--- python20.wse	23 Nov 2002 03:49:08 -0000	1.107
***************
*** 1726,1731 ****
  end
  item: Install File
!   Source=.\bsddb.pyd
!   Destination=%MAINDIR%\DLLs\bsddb.pyd
    Flags=0000000000000010
  end
--- 1726,1731 ----
  end
  item: Install File
!   Source=.\_bsddb.pyd
!   Destination=%MAINDIR%\DLLs\_bsddb.pyd
    Flags=0000000000000010
  end
***************
*** 1808,1813 ****
  end
  item: Install File
!   Source=.\bsddb.lib
!   Destination=%MAINDIR%\libs\bsddb.lib
    Flags=0000000000000010
  end
--- 1808,1813 ----
  end
  item: Install File
!   Source=.\_bsddb.lib
!   Destination=%MAINDIR%\libs\_bsddb.lib
    Flags=0000000000000010
  end
***************
*** 1854,1857 ****
--- 1854,1868 ----
  item: Remark
  end
+ item: Remark
+   Text=Oddball -- the Sleepcat DLL
+ end
+ item: Install File
+   Source=..\..\db-4.0.14\build_win32\Release\libdb40.dll
+   Destination=%MAINDIR%\DLLs\libdb40.dll
+   Description=Sleepycat Berekely DB DLL
+   Flags=0000000000000010
+ end
+ item: Remark
+ end
  item: Install File
    Source=.\python%_pymajor_%%_pyminor_%.lib
***************
*** 1888,1891 ****
--- 1899,1910 ----
    Description=Library Modules
    Flags=0000000000000010
+ end
+ item: Remark
+ end
+ item: Install File
+   Source=..\lib\bsddb\*.py
+   Destination=%MAINDIR%\Lib\bsddb
+   Description=Berkeley database package
+   Flags=0000000100000010
  end
  item: Remark

Index: readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** readme.txt	22 Nov 2002 20:00:34 -0000	1.29
--- readme.txt	23 Nov 2002 03:49:08 -0000	1.30
***************
*** 177,180 ****
--- 177,185 ----
      and follow the instructions for building the Sleepycat software.
      Build the Release version.
+     NOTE:  The instructions are for a later release of the software,
+     so use your imagination.  Berkeley_DB.dsw in this release was
+     also pre-MSVC6, so you'll be prompted to upgrade the format (say
+     yes, of course).  Choose configuration "db_buildall - Win32 Release",
+     and build db_buildall.exe.
  
      XXX You have to copy
***************
*** 188,193 ****
      XXX bsddb 1.85 project apparently managed to do, link the Berkeley
      XXX DLL into the guts of our _bsddb.pyd.  I don't know how to.
- 
-     XXX The installer needs to be changed accordingly.
  
      XXX The Sleepycat release we use will probably change before
--- 193,196 ----