mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Taught svneol to look at .c and .h files too, and

Browse source 
it found a bunch more in need of svn:eol-style.
This commit is contained in:
Tim Peters 2006-03-09 01:59:27 +00:00
parent d87f81f5f3
commit 84457af29e
2 changed files with 95 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

176
PCbuild/make_buildinfo.c
View file

@ -1,89 +1,89 @@
#include <windows.h> #include <windows.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <stdio.h> #include <stdio.h>
/* This file creates the getbuildinfo.o object, by first /* This file creates the getbuildinfo.o object, by first
invoking subwcrev.exe (if found), and then invoking cl.exe. invoking subwcrev.exe (if found), and then invoking cl.exe.
As a side effect, it might generate PCBuild\getbuildinfo2.c As a side effect, it might generate PCBuild\getbuildinfo2.c
also. If this isn't a subversion checkout, or subwcrev isn't also. If this isn't a subversion checkout, or subwcrev isn't
found, it compiles ..\\Modules\\getbuildinfo.c instead. found, it compiles ..\\Modules\\getbuildinfo.c instead.
Currently, subwcrev.exe is found from the registry entries Currently, subwcrev.exe is found from the registry entries
of TortoiseSVN. of TortoiseSVN.
No attempt is made to place getbuildinfo.o into the proper No attempt is made to place getbuildinfo.o into the proper
binary directory. This isn't necessary, as this tool is binary directory. This isn't necessary, as this tool is
invoked as a pre-link step for pythoncore, so that overwrites invoked as a pre-link step for pythoncore, so that overwrites
any previous getbuildinfo.o. any previous getbuildinfo.o.
*/ */
int make_buildinfo2() int make_buildinfo2()
{ {
struct _stat st; struct _stat st;
HKEY hTortoise; HKEY hTortoise;
char command[500]; char command[500];
DWORD type, size; DWORD type, size;
if (_stat(".svn", &st) < 0) if (_stat(".svn", &st) < 0)
return 0; return 0;
if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS && if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS &&
RegOpenKey(HKEY_CURRENT_USER, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS) RegOpenKey(HKEY_CURRENT_USER, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS)
/* Tortoise not installed */ /* Tortoise not installed */
return 0; return 0;
command[0] = '"'; /* quote the path to the executable */ command[0] = '"'; /* quote the path to the executable */
size = sizeof(command) - 1; size = sizeof(command) - 1;
if (RegQueryValueEx(hTortoise, "Directory", 0, &type, command+1, &size) != ERROR_SUCCESS || if (RegQueryValueEx(hTortoise, "Directory", 0, &type, command+1, &size) != ERROR_SUCCESS ||
type != REG_SZ) type != REG_SZ)
/* Registry corrupted */ /* Registry corrupted */
return 0; return 0;
strcat(command, "bin\\subwcrev.exe"); strcat(command, "bin\\subwcrev.exe");
if (_stat(command+1, &st) < 0) if (_stat(command+1, &st) < 0)
/* subwcrev.exe not part of the release */ /* subwcrev.exe not part of the release */
return 0; return 0;
strcat(command, "\" .. ..\\Modules\\getbuildinfo.c getbuildinfo2.c"); strcat(command, "\" .. ..\\Modules\\getbuildinfo.c getbuildinfo2.c");
puts(command); fflush(stdout); puts(command); fflush(stdout);
if (system(command) < 0) if (system(command) < 0)
return 0; return 0;
return 1; return 1;
} }
int main(int argc, char*argv[]) int main(int argc, char*argv[])
{ {
char command[500] = "cl.exe -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS -DWIN32 -D_WINDLL "; char command[500] = "cl.exe -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS -DWIN32 -D_WINDLL ";
int do_unlink, result; int do_unlink, result;
if (argc != 2) { if (argc != 2) {
fprintf(stderr, "make_buildinfo $(ConfigurationName)\n"); fprintf(stderr, "make_buildinfo $(ConfigurationName)\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (strcmp(argv[1], "Release") == 0) { if (strcmp(argv[1], "Release") == 0) {
strcat(command, "-MD "); strcat(command, "-MD ");
} }
else if (strcmp(argv[1], "Debug") == 0) { else if (strcmp(argv[1], "Debug") == 0) {
strcat(command, "-D_DEBUG -MDd "); strcat(command, "-D_DEBUG -MDd ");
} }
else if (strcmp(argv[1], "ReleaseItanium") == 0) { else if (strcmp(argv[1], "ReleaseItanium") == 0) {
strcat(command, "-MD /USECL:MS_ITANIUM "); strcat(command, "-MD /USECL:MS_ITANIUM ");
} }
else if (strcmp(argv[1], "ReleaseAMD64") == 0) { else if (strcmp(argv[1], "ReleaseAMD64") == 0) {
strcat(command, "-MD "); strcat(command, "-MD ");
strcat(command, "-MD /USECL:MS_OPTERON "); strcat(command, "-MD /USECL:MS_OPTERON ");
} }
else { else {
fprintf(stderr, "unsupported configuration %s\n", argv[1]); fprintf(stderr, "unsupported configuration %s\n", argv[1]);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if ((do_unlink = make_buildinfo2())) if ((do_unlink = make_buildinfo2()))
strcat(command, "getbuildinfo2.c -DSUBWCREV "); strcat(command, "getbuildinfo2.c -DSUBWCREV ");
else else
strcat(command, "..\\Modules\\getbuildinfo.c"); strcat(command, "..\\Modules\\getbuildinfo.c");
strcat(command, " -Fogetbuildinfo.o -I..\\Include -I..\\PC"); strcat(command, " -Fogetbuildinfo.o -I..\\Include -I..\\PC");
puts(command); fflush(stdout); puts(command); fflush(stdout);
result = system(command); result = system(command);
if (do_unlink) if (do_unlink)
unlink("getbuildinfo2.c"); unlink("getbuildinfo2.c");
if (result < 0) if (result < 0)
return EXIT_FAILURE; return EXIT_FAILURE;
return 0; return 0;
} }

11
Tools/scripts/svneol.py
View file

@ -3,8 +3,8 @@
""" """
SVN helper script. SVN helper script.
Try to set the svn:eol-style property to "native" on every .py and .txt file Try to set the svn:eol-style property to "native" on every .py, .txt, .c and
in the directory tree rooted at the current directory. .h file in the directory tree rooted at the current directory.
Files with the svn:eol-style property already set (to anything) are skipped. Files with the svn:eol-style property already set (to anything) are skipped.
@ -30,16 +30,19 @@ and for a file with a binary mime-type property:
svn: File 'Lib\test\test_pep263.py' has binary mime type property svn: File 'Lib\test\test_pep263.py' has binary mime type property
TODO: This is slow, and especially on Windows, because it invokes a new svn TODO: This is slow, and especially on Windows, because it invokes a new svn
command-line operation for every .py and .txt file. command-line operation for every file with the right extension.
""" """
import re
import os import os
possible_text_file = re.compile(r"\.([hc]|py|txt)$").search
for root, dirs, files in os.walk('.'): for root, dirs, files in os.walk('.'):
if '.svn' in dirs: if '.svn' in dirs:
dirs.remove('.svn') dirs.remove('.svn')
for fn in files: for fn in files:
if fn.endswith('.py') or fn.endswith('.txt'): if possible_text_file(fn):
path = os.path.join(root, fn) path = os.path.join(root, fn)
p = os.popen('svn proplist "%s"' % path) p = os.popen('svn proplist "%s"' % path)
guts = p.read() guts = p.read()