Bit of cleanup on the projects.

Some refinements on the Wise file, also adding mmap.pyd.

diff --git a/PCbuild/mmap.dsp b/PCbuild/mmap.dsp
index d6135d1910783f7e5c33048688b3f7f68e87bab3..f902475ffbfdcc3a95d767abd2977e03e0d40235 100644 (file)
--- a/PCbuild/mmap.dsp
+++ b/PCbuild/mmap.dsp
@@ -23,8 +23,8 @@ CFG=mmap - Win32 Debug
 \r
 # Begin Project\r
 # PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
+# PROP Scc_ProjName "mmap"\r
+# PROP Scc_LocalPath ".."\r
 CPP=cl.exe\r
 MTL=midl.exe\r
 RSC=rc.exe\r
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""\r
 F90=df.exe\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MMAP_EXPORTS" /YX /FD /c\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"\r
@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
-# 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\r
-# 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\r
+# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0xc09 /d "_DEBUG"\r

diff --git a/PCbuild/pcbuild.dsw b/PCbuild/pcbuild.dsw
index 641e16b65aebe018e21b829e3d238a32d99930af..7d6e0c2069f33a71edd134481ccb1929b0f71c97 100644 (file)
--- a/PCbuild/pcbuild.dsw
+++ b/PCbuild/pcbuild.dsw
@@ -7,13 +7,14 @@ Project: "_tkinter"=".\_tkinter.dsp" - Package Owner=<4>
 \r
 Package=<5>\r
 {{{\r
+    begin source code control\r
+    _tkinter\r
+    .\r
+    end source code control\r
 }}}\r
 \r
 Package=<4>\r
 {{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name python16\r
-    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
@@ -22,13 +23,14 @@ Project: "bsddb"=".\bsddb.dsp" - Package Owner=<4>
 \r
 Package=<5>\r
 {{{\r
+    begin source code control\r
+    bsddb\r
+    ..\r
+    end source code control\r
 }}}\r
 \r
 Package=<4>\r
 {{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name python16\r
-    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
@@ -37,6 +39,10 @@ Project: "mmap"=".\mmap.dsp" - Package Owner=<4>
 \r
 Package=<5>\r
 {{{\r
+    begin source code control\r
+    mmap\r
+    ..\r
+    end source code control\r
 }}}\r
 \r
 Package=<4>\r
@@ -49,13 +55,14 @@ Project: "parser"=".\parser.dsp" - Package Owner=<4>
 \r
 Package=<5>\r
 {{{\r
+    begin source code control\r
+    parser\r
+    ..\r
+    end source code control\r
 }}}\r
 \r
 Package=<4>\r
 {{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name python16\r
-    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
@@ -64,13 +71,14 @@ Project: "python"=".\python.dsp" - Package Owner=<4>
 \r
 Package=<5>\r
 {{{\r
+    begin source code control\r
+    python\r
+    ..\r
+    end source code control\r
 }}}\r
 \r
 Package=<4>\r
 {{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name python16\r
-    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
@@ -79,6 +87,10 @@ Project: "python16"=".\python16.dsp" - Package Owner=<4>
 \r
 Package=<5>\r
 {{{\r
+    begin source code control\r
+    python16\r
+    ..\r
+    end source code control\r
 }}}\r
 \r
 Package=<4>\r
@@ -91,13 +103,14 @@ Project: "pythonw"=".\pythonw.dsp" - Package Owner=<4>
 \r
 Package=<5>\r
 {{{\r
+    begin source code control\r
+    pythonw\r
+    ..\pc\r
+    end source code control\r
 }}}\r
 \r
 Package=<4>\r
 {{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name python16\r
-    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
@@ -106,13 +119,14 @@ Project: "winreg"=".\winreg.dsp" - Package Owner=<4>
 \r
 Package=<5>\r
 {{{\r
+    begin source code control\r
+    winreg\r
+    ..\pc\r
+    end source code control\r
 }}}\r
 \r
 Package=<4>\r
 {{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name python16\r
-    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
@@ -121,13 +135,14 @@ Project: "zlib"=".\zlib.dsp" - Package Owner=<4>
 \r
 Package=<5>\r
 {{{\r
+    begin source code control\r
+    zlib\r
+    ..\r
+    end source code control\r
 }}}\r
 \r
 Package=<4>\r
 {{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name python16\r
-    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r

diff --git a/PCbuild/python16.wse b/PCbuild/python16.wse
index 739648bd973daef350bc8614abfe90f70534f173..760aab2db5a79ce63947c5e2196528e18b04c5b1 100644 (file)
--- a/PCbuild/python16.wse
+++ b/PCbuild/python16.wse
@@ -1,7 +1,7 @@
 Document Type: WSE\r
 item: Global\r
   Version=5.0\r
-  Title=Python 1.6 alpha 0\r
+  Title=Python 1.6 alpha 1\r
   Flags=00010100\r
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
   Japanese Font Name=MS Gothic\r
@@ -53,7 +53,7 @@ item: Check Configuration
 end\r
 item: Set Variable\r
   Variable=APPTITLE\r
-  Value=Python 1.6 alpha 0\r
+  Value=Python 1.6 alpha 1\r
 end\r
 item: Set Variable\r
   Variable=GROUP\r
@@ -97,6 +97,9 @@ item: Set Variable
 end\r
 item: End Block\r
 end\r
+item: Remark\r
+  Text=Where system DLLs are installed (choose one of the following):\r
+end\r
 item: Set Variable\r
   Variable=DLLDEST\r
   Value=%MAINDIR%\r
@@ -443,7 +446,7 @@ item: Custom Dialog Set
       Text=Python Help Files\r
       Text=Python test suite\r
       Text=Python interpreter and library\r
-      Text=Tcl/Tk installation\r
+      Text=Tcl/Tk support\r
       Text=\r
       Text French=Python Utility Scripts\r
       Text French=Python Help Files\r
@@ -690,6 +693,11 @@ item: Install File
   Destination=%MAINDIR%\DLLs\winreg.pyd\r
   Flags=0000000000000010\r
 end\r
+item: Install File\r
+  Source=%_SRC_%\pcbuild\mmap.pyd\r
+  Destination=%MAINDIR%\DLLs\mmap.pyd\r
+  Flags=0000000000000010\r
+end\r
 item: Install File\r
   Source=%_SRC_%\pcbuild\python16.dll\r
   Destination=%DLLDEST%\python16.dll\r
@@ -797,36 +805,6 @@ item: Install File
   Description=Utility Scripts\r
   Flags=0000000000000010\r
 end\r
-remarked item: Install File\r
-  Source=%_SRC_%\Tools\freeze\*.py\r
-  Destination=%MAINDIR%\Tools\freeze\r
-  Description=Freeze tool\r
-  Flags=0000000000000010\r
-end\r
-remarked item: Install File\r
-  Source=%_SRC_%\Tools\freeze\*.ini\r
-  Destination=%MAINDIR%\Tools\freeze\r
-  Description=Freeze tool\r
-  Flags=0000000000000010\r
-end\r
-remarked item: Install File\r
-  Source=%_SRC_%\Tools\freeze\*.html\r
-  Destination=%MAINDIR%\Tools\freeze\r
-  Description=Freeze tool\r
-  Flags=0000000000000010\r
-end\r
-remarked item: Install File\r
-  Source=%_SRC_%\Tools\freeze\README\r
-  Destination=%MAINDIR%\Tools\freeze\README.txt\r
-  Description=Freeze tool\r
-  Flags=0000000000000010\r
-end\r
-remarked item: Install File\r
-  Source=%_SRC_%\Python\frozenmain.c\r
-  Destination=%MAINDIR%\Tools\freeze\frozenmain.c\r
-  Description=Freeze tool\r
-  Flags=0000000000000010\r
-end\r
 item: Install File\r
   Source=%_SRC_%\Tools\webchecker\*.py\r
   Destination=%MAINDIR%\Tools\webchecker\r
@@ -1192,7 +1170,7 @@ item: If/While Statement
   Value=B\r
   Flags=00001010\r
 end\r
-item: Create Shortcut\r
+remarked item: Create Shortcut\r
   Source=%MAINDIR%\Doc\index.html\r
   Destination=%GROUP%\Python Manuals.lnk\r
   Working Directory=%MAINDIR%\r
@@ -1235,7 +1213,7 @@ item: If/While Statement
   Value=B\r
   Flags=00001010\r
 end\r
-item: Add ProgMan Icon\r
+remarked item: Add ProgMan Icon\r
   Group=%GROUP%\r
   Icon Name=Python Manuals\r
   Command Line=%MAINDIR%\Doc\index.html\r

diff --git a/PCbuild/winreg.dsp b/PCbuild/winreg.dsp
index f080137478f77a96c86b30538da00cbdf56c9ce1..ca9e09b85c1ce615e55f9e30da952781adf5ece1 100644 (file)
--- a/PCbuild/winreg.dsp
+++ b/PCbuild/winreg.dsp
@@ -89,9 +89,6 @@ LINK32=link.exe
 \r
 # Name "winreg - Win32 Release"\r
 # Name "winreg - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
 SOURCE=..\PC\winreg.c\r
@@ -107,14 +104,5 @@ SOURCE=..\PC\winreg.c
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
 # End Target\r
 # End Project\r