diff options
| author | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2010-11-22 11:37:06 +0000 |
|---|---|---|
| committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2010-11-22 11:37:06 +0000 |
| commit | abe2ec608ee600942181d6bf42679bf489ea3623 (patch) | |
| tree | 1ad5d1770d7d58d3e7b87d446964c8d43e4f51e0 /PCbuild | |
| parent | 97ea9fdbb1784c3b4c1906e9e71d7315fc87baba (diff) | |
| download | cpython-abe2ec608ee600942181d6bf42679bf489ea3623.tar.gz | |
issue 10501
make_buildinfo regression with unquoted path
Make_buildinfo.exe should be called with a quoted path, and should quote the full paths to its temp files, to support spaces in filenames.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/make_buildinfo.c | 16 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcproj | 32 |
2 files changed, 25 insertions, 23 deletions
diff --git a/PCbuild/make_buildinfo.c b/PCbuild/make_buildinfo.c index a41aac59b8..94ca8c08b6 100644 --- a/PCbuild/make_buildinfo.c +++ b/PCbuild/make_buildinfo.c @@ -52,9 +52,9 @@ int make_buildinfo2(const char *tmppath) if (_stat(command+1, &st) < 0) /* subwcrev.exe not part of the release */ return 0; - strcat_s(command, CMD_SIZE, "\" .. ..\\Modules\\getbuildinfo.c "); - strcat_s(command, CMD_SIZE, tmppath); - strcat_s(command, CMD_SIZE, "getbuildinfo2.c"); + strcat_s(command, CMD_SIZE, "\" .. ..\\Modules\\getbuildinfo.c \""); + strcat_s(command, CMD_SIZE, tmppath); /* quoted tmppath */ + strcat_s(command, CMD_SIZE, "getbuildinfo2.c\""); puts(command); fflush(stdout); if (system(command) < 0) return 0; @@ -95,19 +95,21 @@ int main(int argc, char*argv[]) } if ((do_unlink = make_buildinfo2(tmppath))) { + strcat_s(command, CMD_SIZE, "\""); strcat_s(command, CMD_SIZE, tmppath); - strcat_s(command, CMD_SIZE, "getbuildinfo2.c -DSUBWCREV "); + strcat_s(command, CMD_SIZE, "getbuildinfo2.c\" -DSUBWCREV "); } else strcat_s(command, CMD_SIZE, "..\\Modules\\getbuildinfo.c"); - strcat_s(command, CMD_SIZE, " -Fo"); + strcat_s(command, CMD_SIZE, " -Fo\""); strcat_s(command, CMD_SIZE, tmppath); - strcat_s(command, CMD_SIZE, "getbuildinfo.o -I..\\Include -I..\\PC"); + strcat_s(command, CMD_SIZE, "getbuildinfo.o\" -I..\\Include -I..\\PC"); puts(command); fflush(stdout); result = system(command); if (do_unlink) { command[0] = '\0'; + strcat_s(command, CMD_SIZE, "\""); strcat_s(command, CMD_SIZE, tmppath); - strcat_s(command, CMD_SIZE, "getbuildinfo2.c"); + strcat_s(command, CMD_SIZE, "getbuildinfo2.c\""); _unlink(command); } if (result < 0) diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index f5d12a3fb4..c0ffae5548 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -59,11 +59,11 @@ <Tool Name="VCPreLinkEventTool" Description="Generate build information..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release $(IntDir)" + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release "$(IntDir)\"" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(IntDir)\getbuildinfo.o" + AdditionalDependencies=""$(IntDir)getbuildinfo.o"" OutputFile="$(OutDir)\$(PyDllName).dll" IgnoreDefaultLibraryNames="libc" ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" @@ -134,11 +134,11 @@ <Tool Name="VCPreLinkEventTool" Description="Generate build information..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release $(IntDir)" + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release "$(IntDir)\"" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(IntDir)\getbuildinfo.o" + AdditionalDependencies=""$(IntDir)getbuildinfo.o"" OutputFile="$(OutDir)\$(PyDllName).dll" IgnoreDefaultLibraryNames="libc" ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" @@ -212,11 +212,11 @@ <Tool Name="VCPreLinkEventTool" Description="Generate build information..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug $(IntDir)" + CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug "$(IntDir)\"" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(IntDir)\getbuildinfo.o" + AdditionalDependencies=""$(IntDir)getbuildinfo.o"" OutputFile="$(OutDir)\$(PyDllName)_d.dll" IgnoreDefaultLibraryNames="libc" ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb" @@ -290,11 +290,11 @@ <Tool Name="VCPreLinkEventTool" Description="Generate build information..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug $(IntDir)" + CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug "$(IntDir)\"" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(IntDir)\getbuildinfo.o" + AdditionalDependencies=""$(IntDir)getbuildinfo.o"" OutputFile="$(OutDir)\$(PyDllName)_d.dll" IgnoreDefaultLibraryNames="libc" ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb" @@ -364,11 +364,11 @@ <Tool Name="VCPreLinkEventTool" Description="Generate build information..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release $(IntDir)" + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release "$(IntDir)\"" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(IntDir)\getbuildinfo.o" + AdditionalDependencies=""$(IntDir)getbuildinfo.o"" OutputFile="$(OutDir)\$(PyDllName).dll" IgnoreDefaultLibraryNames="libc" ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" @@ -439,11 +439,11 @@ <Tool Name="VCPreLinkEventTool" Description="Generate build information..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release $(IntDir)" + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release "$(IntDir)\"" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(IntDir)\getbuildinfo.o" + AdditionalDependencies=""$(IntDir)getbuildinfo.o"" OutputFile="$(OutDir)\$(PyDllName).dll" IgnoreDefaultLibraryNames="libc" ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" @@ -514,11 +514,11 @@ <Tool Name="VCPreLinkEventTool" Description="Generate build information..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release ($IntDir)" + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release "$(IntDir)\"" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(IntDir)\getbuildinfo.o" + AdditionalDependencies=""$(IntDir)getbuildinfo.o"" OutputFile="$(OutDir)\$(PyDllName).dll" IgnoreDefaultLibraryNames="libc" ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" @@ -589,11 +589,11 @@ <Tool Name="VCPreLinkEventTool" Description="Generate build information..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release $(IntDir)" + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release "$(IntDir)\"" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(IntDir)\getbuildinfo.o" + AdditionalDependencies=""$(IntDir)getbuildinfo.o"" OutputFile="$(OutDir)\$(PyDllName).dll" IgnoreDefaultLibraryNames="libc" ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" |