traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert most of r41765. Don't use $Revision$ in Py_GetBuildNumber(). Keep the 

use of $(srcdir) in Makefile.pre.in so builds outside the source dir still
work.
This commit is contained in:
Barry Warsaw 2005-12-19 14:43:44 +00:00
parent 4ac13dfc3a
commit ce3a9131c3
2 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.pre.in
View File

@ -351,7 +351,10 @@ buildno: $(PARSER_OBJS) \
$(srcdir)/Modules/getbuildinfo.c $(srcdir)/Modules/getbuildinfo.c
if test -d $(srcdir)/.svn; then \ if test -d $(srcdir)/.svn; then \
svnversion $(srcdir) >buildno; \ svnversion $(srcdir) >buildno; \
fi elif test -f buildno; then \
expr `cat buildno` + 1 >buildno1; \
mv -f buildno1 buildno; \
else echo 1 >buildno; fi
# Build static library # Build static library
# avoid long command lines, same as LIBRARY_OBJS # avoid long command lines, same as LIBRARY_OBJS
@ -443,11 +446,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.dist
# Special rules for object files # Special rules for object files
Modules/getbuildinfo.o: $(srcdir)/Modules/getbuildinfo.c buildno Modules/getbuildinfo.o: $(srcdir)/Modules/getbuildinfo.c buildno
if test -f buildno; then \ $(CC) -c $(PY_CFLAGS) -DBUILD=\"`cat buildno`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
$(CC) -c $(PY_CFLAGS) -DBUILD=\"`cat buildno`\" -o $@ $(srcdir)/Modules/getbuildinfo.c ;\
else \
$(CC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/getbuildinfo.c ;\
fi
Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \

34
Modules/getbuildinfo.c
View File

@ -21,38 +21,20 @@
#endif #endif
#ifndef BUILD #ifndef BUILD
#define BUILD "$Revision$" #define BUILD "0"
#endif #endif
const char *
Py_GetBuildNumber(void)
{
static char buildno[20];
static int buildno_okay;
if (!buildno_okay) {
char *build = BUILD;
int len = strlen(build);
if (len > 13 &&
!strncmp(build, "$Revision: ", 11) &&
!strcmp(build + len - 2, " $"))
{
memcpy(buildno, build + 11, len - 13);
}
else {
memcpy(buildno, build, 19);
}
buildno_okay = 1;
}
return buildno;
}
const char * const char *
Py_GetBuildInfo(void) Py_GetBuildInfo(void)
{ {
static char buildinfo[50]; static char buildinfo[50];
PyOS_snprintf(buildinfo, sizeof(buildinfo), PyOS_snprintf(buildinfo, sizeof(buildinfo),
"#%s, %.20s, %.9s", Py_GetBuildNumber(), DATE, TIME); "%s, %.20s, %.9s", BUILD, DATE, TIME);
return buildinfo; return buildinfo;
} }
const char *
Py_GetBuildNumber(void)
{
return BUILD;
}