diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-04-07 03:17:54 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-04-07 03:17:54 (GMT) |
| commit | d218dc15e6b75d07450e4388c32e39c5741718bf (patch) | |
| tree | b2311594cb8e938b8d978f95962d448f083db7b3 /PCbuild | |
| parent | e9edcc401965c263820d45374eb00df7c4129b59 (diff) | |
| download | cpython-d218dc15e6b75d07450e4388c32e39c5741718bf.zip cpython-d218dc15e6b75d07450e4388c32e39c5741718bf.tar.gz cpython-d218dc15e6b75d07450e4388c32e39c5741718bf.tar.bz2 | |
Merged revisions 62177-62178,62180-62193 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62177 | skip.montanaro | 2008-04-05 21:47:47 +0200 (Sa, 05 Apr 2008) | 2 lines
Declare inittimezone static.
........
r62180 | mark.hammond | 2008-04-06 03:42:06 +0200 (So, 06 Apr 2008) | 4 lines
From issue 1753245 - better _winreg support for x64.
Adds _winreg.DisableReflectionKey, EnableReflectionKey, QueryReflectionKey,
KEY_WOW64_64KEY and KEY_WOW64_32KEY.
........
r62187 | skip.montanaro | 2008-04-06 19:05:57 +0200 (So, 06 Apr 2008) | 1 line
type
........
r62193 | trent.nelson | 2008-04-06 22:51:23 +0200 (So, 06 Apr 2008) | 1 line
Don't run kill_python as part of the build process. Change the buildbots so they have to call it explicitly instead.
........
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/kill_python.vcproj | 8 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcproj | 32 |
2 files changed, 16 insertions, 24 deletions
diff --git a/PCbuild/kill_python.vcproj b/PCbuild/kill_python.vcproj index 9f11075..a34107a 100644 --- a/PCbuild/kill_python.vcproj +++ b/PCbuild/kill_python.vcproj @@ -77,8 +77,6 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Killing existing Python processes..."
- CommandLine=""$(KillPythonExe)""
/>
</Configuration>
<Configuration
@@ -140,8 +138,6 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Killing existing Python processes..."
- CommandLine=""$(KillPythonExe)""
/>
</Configuration>
<Configuration
@@ -202,8 +198,6 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Killing existing Python processes..."
- CommandLine=""$(KillPythonExe)""
/>
</Configuration>
<Configuration
@@ -265,8 +259,6 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Killing existing Python processes..."
- CommandLine=""$(KillPythonExe)""
/>
</Configuration>
</Configurations>
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index 9c9c239..1ad311d 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -58,8 +58,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release" /> <Tool Name="VCLinkerTool" @@ -133,8 +133,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release" /> <Tool Name="VCLinkerTool" @@ -211,8 +211,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug" /> <Tool Name="VCLinkerTool" @@ -289,8 +289,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug" /> <Tool Name="VCLinkerTool" @@ -363,8 +363,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release" /> <Tool Name="VCLinkerTool" @@ -438,8 +438,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release" /> <Tool Name="VCLinkerTool" @@ -513,8 +513,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release" /> <Tool Name="VCLinkerTool" @@ -588,8 +588,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release" /> <Tool Name="VCLinkerTool" |