Mailman 3 December 2004 - Python-checkins

python/dist/src/Lib warnings.py,1.24,1.24.2.1
by doerwalter＠users.sourceforge.net Dec. 29, 2004

Dec. 29, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31216/Lib Modified Files: Tag: release24-maint warnings.py Log Message: Backport checkin: Fix wrong variable name. Index: warnings.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/warnings.py,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -u -d -r1.24 -r1.24.2.1 --- warnings.py 25 Aug 2004 02:14:06 -0000 1.24 +++ warnings.py 29 Dec 2004 15:28:29 -0000 1.24.2.1 @@ -79,7 +79,7 @@ action, msg, cat, mod, ln = item if ((msg is None or msg.match(text)) and issubclass(category, cat) and - (msg is None or mod.match(module)) and + (mod is None or mod.match(module)) and (ln == 0 or lineno == ln)): break else:

1 0

python/dist/src/Lib warnings.py,1.24,1.25
by doerwalter＠users.sourceforge.net Dec. 29, 2004

Dec. 29, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31067/Lib Modified Files: warnings.py Log Message: Fix wrong variable name. Index: warnings.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/warnings.py,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- warnings.py 25 Aug 2004 02:14:06 -0000 1.24 +++ warnings.py 29 Dec 2004 15:28:09 -0000 1.25 @@ -79,7 +79,7 @@ action, msg, cat, mod, ln = item if ((msg is None or msg.match(text)) and issubclass(category, cat) and - (msg is None or mod.match(module)) and + (mod is None or mod.match(module)) and (ln == 0 or lineno == ln)): break else:

1 0

python/dist/src/PC/example_nt example.sln, NONE, 1.1.2.1 example.vcproj, NONE, 1.1.2.1 readme.txt, 1.11, 1.11.24.1 example.dsp, 1.7, NONE example.dsw, 1.2, NONE
by loewis＠users.sourceforge.net Dec. 29, 2004

Dec. 29, 2004

Update of /cvsroot/python/python/dist/src/PC/example_nt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17255 Modified Files: Tag: release24-maint readme.txt Added Files: Tag: release24-maint example.sln example.vcproj Removed Files: Tag: release24-maint example.dsp example.dsw Log Message: Update example to VC 7.1. --- NEW FILE: example.sln --- Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcproj", "{A0608D6F-84ED-44AE-A2A6-A3CC7F4A4030}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug Release = Release EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {A0608D6F-84ED-44AE-A2A6-A3CC7F4A4030}.Debug.ActiveCfg = Debug|Win32 {A0608D6F-84ED-44AE-A2A6-A3CC7F4A4030}.Debug.Build.0 = Debug|Win32 {A0608D6F-84ED-44AE-A2A6-A3CC7F4A4030}.Release.ActiveCfg = Release|Win32 {A0608D6F-84ED-44AE-A2A6-A3CC7F4A4030}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal --- NEW FILE: example.vcproj --- <?xml version="1.0" encoding="windows-1250"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="example" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/example.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/export:initexample" AdditionalDependencies="odbc32.lib odbccp32.lib python24.lib" OutputFile=".\Release/example.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\PCbuild" ModuleDefinitionFile=".\example.def" ProgramDatabaseFile=".\Release/example.pdb" SubSystem="2" ImportLibrary=".\Release/example.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Release/example.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/example.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/export:initexample" AdditionalDependencies="odbc32.lib odbccp32.lib python24_d.lib" OutputFile=".\Debug/example_d.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\PCbuild" ModuleDefinitionFile=".\example.def" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/example_d.pdb" SubSystem="2" ImportLibrary=".\Debug/example_d.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Debug/example.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"> <File RelativePath="example.c"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;$(NoInherit)"/> </FileConfiguration> </File> <File RelativePath="example.def"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;fi;fd"> </Filter> <Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"> </Filter> <File RelativePath="readme.txt"> </File> </Files> <Globals> </Globals> </VisualStudioProject> Index: readme.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/example_nt/readme.txt,v retrieving revision 1.11 retrieving revision 1.11.24.1 diff -u -d -r1.11 -r1.11.24.1 --- readme.txt 15 Dec 2001 22:27:01 -0000 1.11 +++ readme.txt 29 Dec 2004 14:21:24 -0000 1.11.24.1 @@ -3,10 +3,11 @@ This directory contains everything needed (except for the Python distribution!) to build a Python extension module using Microsoft VC++ -("Developer Studio") version 6. It has been tested with VC++ 6.0 on Python -2.2c1. You can also use earlier versions of VC to build Python extensions, -but the sample VC project file (example.dsw in this directory) is in VC 6 -format. +("Developer Studio") version 7.1. It has been tested with VC++ 7.1 on +Python 2.4. You can also use earlier versions of VC to build Python +extensions, but the sample VC project file (example.dsw in this directory) +is in VC 7.1 format. Notice that you need to use the same compiler version +that was used to build Python itself. COPY THIS DIRECTORY! -------------------- @@ -19,10 +20,10 @@ OPEN THE PROJECT ---------------- -From VC 6.x, use the - File -> Open Workspace... +From VC 7.1, use the + File -> Open Solution... dialog (*not* the "File -> Open..." dialog!). Navigate to and select the -file "example.dsw", in the *copy* of the example_nt directory you made +file "example.sln", in the *copy* of the example_nt directory you made above. Click Open. @@ -31,15 +32,12 @@ In order to check that everything is set up right, try building: 1. Select a configuration. This step is optional. Do - Build -> Select Active Configuration... - and select either "example - Win32 Release" or "example - Win32 Debug". + Build -> Configuration Manager... -> Active Solution Configuration + and select either "Release" or "Debug". If you skip this step, you'll use the Debug configuration by default. 2. Build the DLL. Do - Build -> Build example_d.dll - in Debug mode, or - Build -> Build example.dll - in Release mode. + Build -> Build Solution This creates all intermediate and result files in a subdirectory which is called either Debug or Release, depending on which configuration you picked in the preceding step. @@ -96,7 +94,7 @@ Now your options are: -1) Copy example.dsw and example.dsp, rename them to spam.*, and edit them +1) Copy example.sln and example.vcproj, rename them to spam.*, and edit them by hand. or @@ -109,7 +107,8 @@ (This is an annoying little file with only two lines. An alternative approach is to forget about the .def file, and add the option "/export:initspam" somewhere to the Link settings, by manually editing the -"Project Options" box). +"Project -> Properties -> Linker -> Command Line -> Additional Options" +box). You are now all set to build your extension, unless it requires other external libraries, include files, etc. See Python's Extending and @@ -119,47 +118,44 @@ CREATING A BRAND NEW PROJECT ---------------------------- Use the - File -> New... -> Projects -dialog to create a new Project Workspace. Select "Win32 Dynamic-Link -Library", enter the name ("spam"), and make sure the "Location" is set to -the spam directory you have created (which should be a direct subdirectory -of the Python build tree, a sibling of Include and PC). Select Win32 as the -platform (in my version, this is the only choice). Make sure the "Create -new workspace" radio button is selected. Click OK. + File -> New -> Project... +dialog to create a new Project Workspace. Select "Visual C++ Projects/Win32/ +Win32 Project", enter the name ("spam"), and make sure the "Location" is +set to parent of the spam directory you have created (which should be a direct +subdirectory of the Python build tree, a sibling of Include and PC). +In "Application Settings", select "DLL", and "Empty Project". Click OK. + +You should now create the file spam.def as instructed in the previous +section. Add the source files (including the .def file) to the project, +using "Project", "Add Existing Item". Now open the - Project -> Settings... + Project -> spam properties... dialog. (Impressive, isn't it? :-) You only need to change a few settings. Make sure "All Configurations" is selected from the "Settings -for:" dropdown list. Select the "C/C++" tab. Choose the "Preprocessor" +for:" dropdown list. Select the "C/C++" tab. Choose the "General" category in the popup menu at the top. Type the following text in the -entry box labeled "Addditional include directories:" +entry box labeled "Addditional Include Directories:" ..\Include,..\PC -Then, choose the "Input" category in the Link tab, and enter +Then, choose the "General" category in the "Linker" tab, and enter ..\PCbuild -in the "Additional library path:" box. +in the "Additional library Directories" box. -Now you need to add some mode-specific settings: +Now you need to add some mode-specific settings (select "Accept" +when asked to confirm your changes): -Select "Win32 Release" in the "Settings for:" dropdown list. Click the -"Link" tab, choose the "Input" Category, and append "python22.lib" to the -list in the "Object/library modules:" box. +Select "Release" in the "Configuration" dropdown list. Click the +"Link" tab, choose the "Input" Category, and append "python24.lib" to the +list in the "Additional Dependencies" box. -Select "Win32 Debug" in the "Settings for:" dropdown list, and append -"python22_d.lib" to the list in the "Object/library modules:" box. Then -click on the C/C++ tab, select "Code Generation" from the "Category:" -dropdown list, and select "Debug Multithreaded DLL" from the "Use run-time -library:" dropdown list. +Select "Debug" in the "Settings for:" dropdown list, and append +"python24_d.lib" to the list in the Additional Dependencies" box. Then +click on the C/C++ tab, select "Code Generation", and select +"Multi-threaded Debug DLL" from the "Runtime library" dropdown list. -Select "Win32 Release" again from the "Settings for:" dropdown list. -Select "Multithreaded DLL" from the "Use run-time library:" dropdown list. +Select "Release" again from the "Settings for:" dropdown list. +Select "Multi-threaded DLL" from the "Use run-time library:" dropdown list. That's all <wink>. - -You should now create the file spam.def as instructed in the previous -section. Then chose the - Insert -> Files into Project... -dialog. Set the pattern to *.* and select both spam.c and spam.def and -click OK. (Inserting them one by one is fine too.) --- example.dsp DELETED --- --- example.dsw DELETED ---

1 0

python/dist/src/PC/example_nt example.sln, NONE, 1.1 example.vcproj, NONE, 1.1 readme.txt, 1.11, 1.12 example.dsp, 1.7, NONE example.dsw, 1.2, NONE
by loewis＠users.sourceforge.net Dec. 29, 2004

Dec. 29, 2004

Update of /cvsroot/python/python/dist/src/PC/example_nt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16364 Modified Files: readme.txt Added Files: example.sln example.vcproj Removed Files: example.dsp example.dsw Log Message: Update example to VC 7.1. Will backport to 2.4. --- NEW FILE: example.sln --- Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcproj", "{A0608D6F-84ED-44AE-A2A6-A3CC7F4A4030}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug Release = Release EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {A0608D6F-84ED-44AE-A2A6-A3CC7F4A4030}.Debug.ActiveCfg = Debug|Win32 {A0608D6F-84ED-44AE-A2A6-A3CC7F4A4030}.Debug.Build.0 = Debug|Win32 {A0608D6F-84ED-44AE-A2A6-A3CC7F4A4030}.Release.ActiveCfg = Release|Win32 {A0608D6F-84ED-44AE-A2A6-A3CC7F4A4030}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal --- NEW FILE: example.vcproj --- <?xml version="1.0" encoding="windows-1250"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="example" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/example.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/export:initexample" AdditionalDependencies="odbc32.lib odbccp32.lib python24.lib" OutputFile=".\Release/example.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\PCbuild" ModuleDefinitionFile=".\example.def" ProgramDatabaseFile=".\Release/example.pdb" SubSystem="2" ImportLibrary=".\Release/example.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Release/example.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/example.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/export:initexample" AdditionalDependencies="odbc32.lib odbccp32.lib python24_d.lib" OutputFile=".\Debug/example_d.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\PCbuild" ModuleDefinitionFile=".\example.def" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/example_d.pdb" SubSystem="2" ImportLibrary=".\Debug/example_d.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Debug/example.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"> <File RelativePath="example.c"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;$(NoInherit)"/> </FileConfiguration> </File> <File RelativePath="example.def"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;fi;fd"> </Filter> <Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"> </Filter> <File RelativePath="readme.txt"> </File> </Files> <Globals> </Globals> </VisualStudioProject> Index: readme.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/example_nt/readme.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- readme.txt 15 Dec 2001 22:27:01 -0000 1.11 +++ readme.txt 29 Dec 2004 14:15:58 -0000 1.12 @@ -3,10 +3,11 @@ This directory contains everything needed (except for the Python distribution!) to build a Python extension module using Microsoft VC++ -("Developer Studio") version 6. It has been tested with VC++ 6.0 on Python -2.2c1. You can also use earlier versions of VC to build Python extensions, -but the sample VC project file (example.dsw in this directory) is in VC 6 -format. +("Developer Studio") version 7.1. It has been tested with VC++ 7.1 on +Python 2.4. You can also use earlier versions of VC to build Python +extensions, but the sample VC project file (example.dsw in this directory) +is in VC 7.1 format. Notice that you need to use the same compiler version +that was used to build Python itself. COPY THIS DIRECTORY! -------------------- @@ -19,10 +20,10 @@ OPEN THE PROJECT ---------------- -From VC 6.x, use the - File -> Open Workspace... +From VC 7.1, use the + File -> Open Solution... dialog (*not* the "File -> Open..." dialog!). Navigate to and select the -file "example.dsw", in the *copy* of the example_nt directory you made +file "example.sln", in the *copy* of the example_nt directory you made above. Click Open. @@ -31,15 +32,12 @@ In order to check that everything is set up right, try building: 1. Select a configuration. This step is optional. Do - Build -> Select Active Configuration... - and select either "example - Win32 Release" or "example - Win32 Debug". + Build -> Configuration Manager... -> Active Solution Configuration + and select either "Release" or "Debug". If you skip this step, you'll use the Debug configuration by default. 2. Build the DLL. Do - Build -> Build example_d.dll - in Debug mode, or - Build -> Build example.dll - in Release mode. + Build -> Build Solution This creates all intermediate and result files in a subdirectory which is called either Debug or Release, depending on which configuration you picked in the preceding step. @@ -96,7 +94,7 @@ Now your options are: -1) Copy example.dsw and example.dsp, rename them to spam.*, and edit them +1) Copy example.sln and example.vcproj, rename them to spam.*, and edit them by hand. or @@ -109,7 +107,8 @@ (This is an annoying little file with only two lines. An alternative approach is to forget about the .def file, and add the option "/export:initspam" somewhere to the Link settings, by manually editing the -"Project Options" box). +"Project -> Properties -> Linker -> Command Line -> Additional Options" +box). You are now all set to build your extension, unless it requires other external libraries, include files, etc. See Python's Extending and @@ -119,47 +118,44 @@ CREATING A BRAND NEW PROJECT ---------------------------- Use the - File -> New... -> Projects -dialog to create a new Project Workspace. Select "Win32 Dynamic-Link -Library", enter the name ("spam"), and make sure the "Location" is set to -the spam directory you have created (which should be a direct subdirectory -of the Python build tree, a sibling of Include and PC). Select Win32 as the -platform (in my version, this is the only choice). Make sure the "Create -new workspace" radio button is selected. Click OK. + File -> New -> Project... +dialog to create a new Project Workspace. Select "Visual C++ Projects/Win32/ +Win32 Project", enter the name ("spam"), and make sure the "Location" is +set to parent of the spam directory you have created (which should be a direct +subdirectory of the Python build tree, a sibling of Include and PC). +In "Application Settings", select "DLL", and "Empty Project". Click OK. + +You should now create the file spam.def as instructed in the previous +section. Add the source files (including the .def file) to the project, +using "Project", "Add Existing Item". Now open the - Project -> Settings... + Project -> spam properties... dialog. (Impressive, isn't it? :-) You only need to change a few settings. Make sure "All Configurations" is selected from the "Settings -for:" dropdown list. Select the "C/C++" tab. Choose the "Preprocessor" +for:" dropdown list. Select the "C/C++" tab. Choose the "General" category in the popup menu at the top. Type the following text in the -entry box labeled "Addditional include directories:" +entry box labeled "Addditional Include Directories:" ..\Include,..\PC -Then, choose the "Input" category in the Link tab, and enter +Then, choose the "General" category in the "Linker" tab, and enter ..\PCbuild -in the "Additional library path:" box. +in the "Additional library Directories" box. -Now you need to add some mode-specific settings: +Now you need to add some mode-specific settings (select "Accept" +when asked to confirm your changes): -Select "Win32 Release" in the "Settings for:" dropdown list. Click the -"Link" tab, choose the "Input" Category, and append "python22.lib" to the -list in the "Object/library modules:" box. +Select "Release" in the "Configuration" dropdown list. Click the +"Link" tab, choose the "Input" Category, and append "python24.lib" to the +list in the "Additional Dependencies" box. -Select "Win32 Debug" in the "Settings for:" dropdown list, and append -"python22_d.lib" to the list in the "Object/library modules:" box. Then -click on the C/C++ tab, select "Code Generation" from the "Category:" -dropdown list, and select "Debug Multithreaded DLL" from the "Use run-time -library:" dropdown list. +Select "Debug" in the "Settings for:" dropdown list, and append +"python24_d.lib" to the list in the Additional Dependencies" box. Then +click on the C/C++ tab, select "Code Generation", and select +"Multi-threaded Debug DLL" from the "Runtime library" dropdown list. -Select "Win32 Release" again from the "Settings for:" dropdown list. -Select "Multithreaded DLL" from the "Use run-time library:" dropdown list. +Select "Release" again from the "Settings for:" dropdown list. +Select "Multi-threaded DLL" from the "Use run-time library:" dropdown list. That's all <wink>. - -You should now create the file spam.def as instructed in the previous -section. Then chose the - Insert -> Files into Project... -dialog. Set the pattern to *.* and select both spam.c and spam.def and -click OK. (Inserting them one by one is fine too.) --- example.dsp DELETED --- --- example.dsw DELETED ---

1 0

python/dist/src/Lib/encodings charmap.py, 1.3, 1.3.18.1
by doerwalter＠users.sourceforge.net Dec. 29, 2004

Dec. 29, 2004

Update of /cvsroot/python/python/dist/src/Lib/encodings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/Lib/encodings Modified Files: Tag: release24-maint charmap.py Log Message: Backport checkin: Fix wrong variable name. Index: charmap.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/encodings/charmap.py,v retrieving revision 1.3 retrieving revision 1.3.18.1 diff -u -d -r1.3 -r1.3.18.1 --- charmap.py 8 Aug 2002 20:19:18 -0000 1.3 +++ charmap.py 29 Dec 2004 13:12:39 -0000 1.3.18.1 @@ -36,7 +36,7 @@ def __init__(self,stream,errors='strict',mapping=None): - codecs.StreamReader.__init__(self,strict,errors) + codecs.StreamReader.__init__(self,stream,errors) self.mapping = mapping def decode(self,input,errors='strict'):

1 0

python/dist/src/Lib/encodings charmap.py,1.3,1.4
by doerwalter＠users.sourceforge.net Dec. 29, 2004

Dec. 29, 2004

Update of /cvsroot/python/python/dist/src/Lib/encodings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6413/Lib/encodings Modified Files: charmap.py Log Message: Fix wrong variable name. Index: charmap.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/encodings/charmap.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- charmap.py 8 Aug 2002 20:19:18 -0000 1.3 +++ charmap.py 29 Dec 2004 13:11:10 -0000 1.4 @@ -36,7 +36,7 @@ def __init__(self,stream,errors='strict',mapping=None): - codecs.StreamReader.__init__(self,strict,errors) + codecs.StreamReader.__init__(self,stream,errors) self.mapping = mapping def decode(self,input,errors='strict'):

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.125, 1.126
by akuchling＠users.sourceforge.net Dec. 29, 2004

Dec. 29, 2004

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32672 Modified Files: whatsnew24.tex Log Message: Typo fix Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- whatsnew24.tex 26 Dec 2004 15:29:28 -0000 1.125 +++ whatsnew24.tex 29 Dec 2004 12:34:21 -0000 1.126 @@ -1458,7 +1458,7 @@ (Contributed by Jim Fulton.) \item The \module{timeit} module now automatically disables periodic - garbarge collection during the timing loop. This change makes + garbage collection during the timing loop. This change makes consecutive timings more comparable. (Contributed by Raymond Hettinger.) \item The \module{weakref} module now supports a wider variety of objects

1 0

python/dist/src/Lib/plat-mac pimp.py, 1.35, 1.35.4.1
by jackjansen＠users.sourceforge.net Dec. 28, 2004

Dec. 28, 2004

Update of /cvsroot/python/python/dist/src/Lib/plat-mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13532 Modified Files: Tag: release24-maint pimp.py Log Message: Backport of 1.36: - getDefaultDatabase wasn't listed in __all__. - using a different database for non-final releases should only be done for X.Y.0. Non-final micro releases can use the default database just fine, as they are required to be backward compatible. Index: pimp.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/pimp.py,v retrieving revision 1.35 retrieving revision 1.35.4.1 diff -u -d -r1.35 -r1.35.4.1 --- pimp.py 18 Jul 2004 06:14:45 -0000 1.35 +++ pimp.py 28 Dec 2004 21:53:49 -0000 1.35.4.1 @@ -28,7 +28,7 @@ import time __all__ = ["PimpPreferences", "PimpDatabase", "PimpPackage", "main", - "PIMP_VERSION", "main"] + "getDefaultDatabase", "PIMP_VERSION", "main"] _scriptExc_NotInstalled = "pimp._scriptExc_NotInstalled" _scriptExc_OldInstalled = "pimp._scriptExc_OldInstalled" @@ -55,7 +55,7 @@ major, minor, micro, state, extra = sys.version_info pyvers = '%d.%d' % (major, minor) - if state != 'final': + if micro == 0 and state != 'final': pyvers = pyvers + '%s%d' % (state, extra) longplatform = distutils.util.get_platform()

1 0

python/dist/src/Lib/plat-mac pimp.py, 1.27.4.2, 1.27.4.3
by jackjansen＠users.sourceforge.net Dec. 28, 2004

Dec. 28, 2004

Update of /cvsroot/python/python/dist/src/Lib/plat-mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13423 Modified Files: Tag: release23-maint pimp.py Log Message: Backport of 1.36: - getDefaultDatabase wasn't listed in __all__. - using a different database for non-final releases should only be done for X.Y.0. Non-final micro releases can use the default database just fine, as they are required to be backward compatible. Index: pimp.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/pimp.py,v retrieving revision 1.27.4.2 retrieving revision 1.27.4.3 diff -u -d -r1.27.4.2 -r1.27.4.3 --- pimp.py 3 Jun 2004 13:07:39 -0000 1.27.4.2 +++ pimp.py 28 Dec 2004 21:53:15 -0000 1.27.4.3 @@ -28,7 +28,7 @@ import time __all__ = ["PimpPreferences", "PimpDatabase", "PimpPackage", "main", - "PIMP_VERSION", "main"] + "getDefaultDatabase", "PIMP_VERSION", "main"] _scriptExc_NotInstalled = "pimp._scriptExc_NotInstalled" _scriptExc_OldInstalled = "pimp._scriptExc_OldInstalled" @@ -55,7 +55,7 @@ major, minor, micro, state, extra = sys.version_info pyvers = '%d.%d' % (major, minor) - if state != 'final': + if micro == 0 and state != 'final': pyvers = pyvers + '%s%d' % (state, extra) longplatform = distutils.util.get_platform()

1 0

python/dist/src/Lib/plat-mac pimp.py,1.35,1.36
by jackjansen＠users.sourceforge.net Dec. 28, 2004

Dec. 28, 2004

Update of /cvsroot/python/python/dist/src/Lib/plat-mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9780 Modified Files: pimp.py Log Message: - getDefaultDatabase wasn't listed in __all__. - using a different database for non-final releases should only be done for X.Y.0. Non-final micro releases can use the default database just fine, as they are required to be backward compatible. Index: pimp.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/pimp.py,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- pimp.py 18 Jul 2004 06:14:45 -0000 1.35 +++ pimp.py 28 Dec 2004 21:33:27 -0000 1.36 @@ -28,7 +28,7 @@ import time __all__ = ["PimpPreferences", "PimpDatabase", "PimpPackage", "main", - "PIMP_VERSION", "main"] + "getDefaultDatabase", "PIMP_VERSION", "main"] _scriptExc_NotInstalled = "pimp._scriptExc_NotInstalled" _scriptExc_OldInstalled = "pimp._scriptExc_OldInstalled" @@ -55,7 +55,7 @@ major, minor, micro, state, extra = sys.version_info pyvers = '%d.%d' % (major, minor) - if state != 'final': + if micro == 0 and state != 'final': pyvers = pyvers + '%s%d' % (state, extra) longplatform = distutils.util.get_platform()

1 0