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 d6135d1..f902475 100644
--- a/PCbuild/mmap.dsp
+++ b/PCbuild/mmap.dsp
@@ -23,8 +23,8 @@
# 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 @@
# 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 @@
# 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 641e16b..7d6e0c2 100644
--- a/PCbuild/pcbuild.dsw
+++ b/PCbuild/pcbuild.dsw
@@ -7,13 +7,14 @@
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 @@
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 @@
Package=<5>
{{{
+ begin source code control
+ mmap
+ ..
+ end source code control
}}}
Package=<4>
@@ -49,13 +55,14 @@
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 @@
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 @@
Package=<5>
{{{
+ begin source code control
+ python16
+ ..
+ end source code control
}}}
Package=<4>
@@ -91,13 +103,14 @@
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 @@
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 @@
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 739648b..760aab2 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 @@
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 @@
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 @@
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
@@ -691,6 +694,11 @@
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
Flags=0000000000000010
@@ -797,36 +805,6 @@
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 @@
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 @@
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 f080137..ca9e09b 100644
--- a/PCbuild/winreg.dsp
+++ b/PCbuild/winreg.dsp
@@ -89,9 +89,6 @@
# 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 @@
!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