From 43da798b426be41870b5a9cb639f2d06b2b4b985 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 31 Mar 2000 01:33:07 +0000
Subject: [PATCH] Bit of cleanup on the projects. Some refinements on the Wise
 file, also adding mmap.pyd.

---
 PCbuild/mmap.dsp     | 10 ++++----
 PCbuild/pcbuild.dsw  | 57 ++++++++++++++++++++++++++++----------------
 PCbuild/python16.wse | 48 ++++++++++---------------------------
 PCbuild/winreg.dsp   | 12 ----------
 4 files changed, 54 insertions(+), 73 deletions(-)

diff --git a/PCbuild/mmap.dsp b/PCbuild/mmap.dsp
index d6135d19107..f902475ffbf 100644
--- a/PCbuild/mmap.dsp
+++ b/PCbuild/mmap.dsp
@@ -23,8 +23,8 @@ CFG=mmap - Win32 Debug
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
+# PROP Scc_ProjName "mmap"
+# PROP Scc_LocalPath ".."
 CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"
@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 F90=df.exe
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ  /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0xc09 /d "_DEBUG"
diff --git a/PCbuild/pcbuild.dsw b/PCbuild/pcbuild.dsw
index 641e16b65ae..7d6e0c2069f 100644
--- a/PCbuild/pcbuild.dsw
+++ b/PCbuild/pcbuild.dsw
@@ -7,13 +7,14 @@ Project: "_tkinter"=".\_tkinter.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
+    begin source code control
+    _tkinter
+    .
+    end source code control
 }}}
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name python16
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -22,13 +23,14 @@ Project: "bsddb"=".\bsddb.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
+    begin source code control
+    bsddb
+    ..
+    end source code control
 }}}
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name python16
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -37,6 +39,10 @@ Project: "mmap"=".\mmap.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
+    begin source code control
+    mmap
+    ..
+    end source code control
 }}}
 
 Package=<4>
@@ -49,13 +55,14 @@ Project: "parser"=".\parser.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
+    begin source code control
+    parser
+    ..
+    end source code control
 }}}
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name python16
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -64,13 +71,14 @@ Project: "python"=".\python.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
+    begin source code control
+    python
+    ..
+    end source code control
 }}}
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name python16
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -79,6 +87,10 @@ Project: "python16"=".\python16.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
+    begin source code control
+    python16
+    ..
+    end source code control
 }}}
 
 Package=<4>
@@ -91,13 +103,14 @@ Project: "pythonw"=".\pythonw.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
+    begin source code control
+    pythonw
+    ..\pc
+    end source code control
 }}}
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name python16
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -106,13 +119,14 @@ Project: "winreg"=".\winreg.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
+    begin source code control
+    winreg
+    ..\pc
+    end source code control
 }}}
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name python16
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -121,13 +135,14 @@ Project: "zlib"=".\zlib.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
+    begin source code control
+    zlib
+    ..
+    end source code control
 }}}
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name python16
-    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/PCbuild/python16.wse b/PCbuild/python16.wse
index 739648bd973..760aab2db5a 100644
--- a/PCbuild/python16.wse
+++ b/PCbuild/python16.wse
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=5.0
-  Title=Python 1.6 alpha 0
+  Title=Python 1.6 alpha 1
   Flags=00010100
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic
@@ -53,7 +53,7 @@ item: Check Configuration
 end
 item: Set Variable
   Variable=APPTITLE
-  Value=Python 1.6 alpha 0
+  Value=Python 1.6 alpha 1
 end
 item: Set Variable
   Variable=GROUP
@@ -97,6 +97,9 @@ item: Set Variable
 end
 item: End Block
 end
+item: Remark
+  Text=Where system DLLs are installed (choose one of the following):
+end
 item: Set Variable
   Variable=DLLDEST
   Value=%MAINDIR%
@@ -443,7 +446,7 @@ item: Custom Dialog Set
       Text=Python Help Files
       Text=Python test suite
       Text=Python interpreter and library
-      Text=Tcl/Tk installation
+      Text=Tcl/Tk support
       Text=
       Text French=Python Utility Scripts
       Text French=Python Help Files
@@ -690,6 +693,11 @@ item: Install File
   Destination=%MAINDIR%\DLLs\winreg.pyd
   Flags=0000000000000010
 end
+item: Install File
+  Source=%_SRC_%\pcbuild\mmap.pyd
+  Destination=%MAINDIR%\DLLs\mmap.pyd
+  Flags=0000000000000010
+end
 item: Install File
   Source=%_SRC_%\pcbuild\python16.dll
   Destination=%DLLDEST%\python16.dll
@@ -797,36 +805,6 @@ item: Install File
   Description=Utility Scripts
   Flags=0000000000000010
 end
-remarked item: Install File
-  Source=%_SRC_%\Tools\freeze\*.py
-  Destination=%MAINDIR%\Tools\freeze
-  Description=Freeze tool
-  Flags=0000000000000010
-end
-remarked item: Install File
-  Source=%_SRC_%\Tools\freeze\*.ini
-  Destination=%MAINDIR%\Tools\freeze
-  Description=Freeze tool
-  Flags=0000000000000010
-end
-remarked item: Install File
-  Source=%_SRC_%\Tools\freeze\*.html
-  Destination=%MAINDIR%\Tools\freeze
-  Description=Freeze tool
-  Flags=0000000000000010
-end
-remarked item: Install File
-  Source=%_SRC_%\Tools\freeze\README
-  Destination=%MAINDIR%\Tools\freeze\README.txt
-  Description=Freeze tool
-  Flags=0000000000000010
-end
-remarked item: Install File
-  Source=%_SRC_%\Python\frozenmain.c
-  Destination=%MAINDIR%\Tools\freeze\frozenmain.c
-  Description=Freeze tool
-  Flags=0000000000000010
-end
 item: Install File
   Source=%_SRC_%\Tools\webchecker\*.py
   Destination=%MAINDIR%\Tools\webchecker
@@ -1192,7 +1170,7 @@ item: If/While Statement
   Value=B
   Flags=00001010
 end
-item: Create Shortcut
+remarked item: Create Shortcut
   Source=%MAINDIR%\Doc\index.html
   Destination=%GROUP%\Python Manuals.lnk
   Working Directory=%MAINDIR%
@@ -1235,7 +1213,7 @@ item: If/While Statement
   Value=B
   Flags=00001010
 end
-item: Add ProgMan Icon
+remarked item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=Python Manuals
   Command Line=%MAINDIR%\Doc\index.html
diff --git a/PCbuild/winreg.dsp b/PCbuild/winreg.dsp
index f080137478f..ca9e09b85c1 100644
--- a/PCbuild/winreg.dsp
+++ b/PCbuild/winreg.dsp
@@ -89,9 +89,6 @@ LINK32=link.exe
 
 # Name "winreg - Win32 Release"
 # Name "winreg - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
 SOURCE=..\PC\winreg.c
@@ -107,14 +104,5 @@ SOURCE=..\PC\winreg.c
 !ENDIF 
 
 # End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
 # End Target
 # End Project