diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2006-01-05 10:33:59 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2006-01-05 10:33:59 (GMT) |
| commit | c5bf5a00a35dae7d31d1b6eeada0567d7973c5c7 (patch) | |
| tree | 3f9fdb52b1895205530adc2dd8ceddf3d02b67ad | |
| parent | dea59e5755526be328aa6d330ce730e387a7562d (diff) | |
| download | cpython-c5bf5a00a35dae7d31d1b6eeada0567d7973c5c7.zip cpython-c5bf5a00a35dae7d31d1b6eeada0567d7973c5c7.tar.gz cpython-c5bf5a00a35dae7d31d1b6eeada0567d7973c5c7.tar.bz2 | |
Always set SVNVERSION to "exported" if it otherwise fails.
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Modules/getbuildinfo.c | 12 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.in | 8 |
4 files changed, 25 insertions, 17 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 3d08837..1cc43e6 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -438,7 +438,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \ $(SIGNAL_OBJS) \ $(MODOBJS) \ $(srcdir)/Modules/getbuildinfo.c - $(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LANG=C $(SVNVERSION) $(srcdir)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c + $(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LANG=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c index 7343a0f..1ff061f 100644 --- a/Modules/getbuildinfo.c +++ b/Modules/getbuildinfo.c @@ -28,15 +28,17 @@ Py_GetBuildInfo(void) { static char buildinfo[50]; #ifdef SVNVERSION - static char svnversion[] = SVNVERSION; + static char svnversion[50] = SVNVERSION; #else - static char svnversion[20] = "unknown"; - if (strstr(headurl, "/tags/") != NULL) { - int start = ; + static char svnversion[50] = "exported"; +#endif + if (strcmp(svnversion, "exported") == 0 && + strstr(headurl, "/tags/") != NULL) { + int start = 11; + int stop = strlen(revision)-2; strncpy(svnversion, revision+start, stop-start); svnversion[stop-start] = '\0'; } -#endif PyOS_snprintf(buildinfo, sizeof(buildinfo), "%s, %.20s, %.9s", svnversion, DATE, TIME); return buildinfo; @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 41852 . +# From configure.in Revision: 41923 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for python 2.5. # @@ -3576,10 +3576,8 @@ test -n "$AR" || AR="ar" -for ac_prog in svnversion -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +# Extract the first word of "svnversion", so it can be a program name with args. +set dummy svnversion; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_SVNVERSION+set}" = set; then @@ -3595,7 +3593,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_SVNVERSION="$ac_prog" + ac_cv_prog_SVNVERSION="found" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -3613,10 +3611,12 @@ else echo "${ECHO_T}no" >&6 fi - test -n "$SVNVERSION" && break -done -test -n "$SVNVERSION" || SVNVERSION="echo no svnversion" - +if test $SVNVERSION = found +then + SVNVERSION="svnversion \$(srcdir)" +else + SVNVERSION="echo exported" +fi case $MACHDEP in bsdos*|hp*|HP*) diff --git a/configure.in b/configure.in index 16368a7..acd0168 100644 --- a/configure.in +++ b/configure.in @@ -619,7 +619,13 @@ AC_SUBST(AR) AC_CHECK_PROGS(AR, ar aal, ar) AC_SUBST(SVNVERSION) -AC_CHECK_PROGS(SVNVERSION, svnversion, [echo no svnversion]) +AC_CHECK_PROG(SVNVERSION, svnversion, found) +if test $SVNVERSION = found +then + SVNVERSION="svnversion \$(srcdir)" +else + SVNVERSION="echo exported" +fi case $MACHDEP in bsdos*|hp*|HP*) |