Mostly removing stuff the installer does in 2.2 that can't be done in

2.1 (e.g., there was no Lib/test/data directory then, hotshot didn't exist,
ditto the Lib/email package, etc).  Also restored the now-obsolete expat
setup.

diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index b19b5ab9b7cbce04974caa056c2cf48be54725d1..c60a05242badac508ac589af0e12cc3a808d2cce 100644 (file)
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1835,8 +1835,14 @@ item: Remark
   Text=More DLLs
 end
 item: Install File
-  Source=..\..\expat\libs\expat.dll
-  Destination=%MAINDIR%\DLLs\expat.dll
+  Source=..\..\expat\bin\xmlparse.dll
+  Destination=%MAINDIR%\DLLs\xmlparse.dll
+  Description=Expat library
+  Flags=0000000000000010
+end
+item: Install File
+  Source=..\..\expat\bin\xmltok.dll
+  Destination=%MAINDIR%\DLLs\xmltok.dll
   Description=Expat library
   Flags=0000000000000010
 end
@@ -1903,14 +1909,6 @@ item: Install File
 end
 item: Remark
 end
-item: Install File
-  Source=..\lib\email\*.py
-  Destination=%MAINDIR%\Lib\email
-  Description=Library email package
-  Flags=0000000000000010
-end
-item: Remark
-end
 item: Install File
   Source=..\lib\encodings\*.py
   Destination=%MAINDIR%\Lib\encodings
@@ -1919,14 +1917,6 @@ item: Install File
 end
 item: Remark
 end
-item: Install File
-  Source=..\lib\hotshot\*.py
-  Destination=%MAINDIR%\Lib\hotshot
-  Description=Fast Python profiler
-  Flags=0000000000000010
-end
-item: Remark
-end
 item: Install File
   Source=..\lib\lib-old\*.py
   Destination=%MAINDIR%\Lib\lib-old
@@ -1984,8 +1974,8 @@ item: Install File
   Flags=0000000000000010
 end
 item: Install File
-  Source=..\pc\pyconfig.h
-  Destination=%MAINDIR%\include\pyconfig.h
+  Source=..\pc\config.h
+  Destination=%MAINDIR%\include\config.h
   Description=Header files (pyconfig.h)
   Flags=0000000000000010
 end
@@ -2237,14 +2227,6 @@ item: Install File
 end
 item: Remark
 end
-item: Install File
-  Source=..\lib\test\data\*.*
-  Destination=%MAINDIR%\Lib\test\data
-  Description=Python Test files
-  Flags=0000000000000010
-end
-item: Remark
-end
 item: Install File
   Source=..\lib\test\output\*.*
   Destination=%MAINDIR%\Lib\test\output