From: Georg Brandl <georg@python.org>
Date: Sun, 6 Mar 2011 09:13:00 +0000 (+0100)
Subject: Merge build identification to 3.2 branch.
X-Git-Tag: v3.2.1b1~343
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13039c87f14aeed325bcb5fadd202922a614957b;p=python

Merge build identification to 3.2 branch.
---

13039c87f14aeed325bcb5fadd202922a614957b
diff --cc Include/pythonrun.h
index 86da6e0e29,96a0e232f9..bbcae73d21
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@@ -182,10 -120,10 +182,12 @@@ PyAPI_FUNC(const char *) Py_GetBuildInf
  PyAPI_FUNC(const char *) _Py_svnversion(void);
  PyAPI_FUNC(const char *) Py_SubversionRevision(void);
  PyAPI_FUNC(const char *) Py_SubversionShortBranch(void);
+ PyAPI_FUNC(const char *) _Py_hgidentifier(void);
+ PyAPI_FUNC(const char *) _Py_hgversion(void);
 +#endif
  
  /* Internal -- various one-time initializations */
 +#ifndef Py_LIMITED_API
  PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void);
  PyAPI_FUNC(PyObject *) _PySys_Init(void);
  PyAPI_FUNC(void) _PyImport_Init(void);
diff --cc Makefile.pre.in
index 24d364dd5c,211a70354f..d665939c75
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -35,8 -35,9 +35,11 @@@ LINKCC=		@LINKCC
  AR=		@AR@
  RANLIB=		@RANLIB@
  SVNVERSION=	@SVNVERSION@
 +SOABI=		@SOABI@
 +LDVERSION=	@LDVERSION@
+ HGVERSION=	@HGVERSION@
+ HGTAG=		@HGTAG@
+ HGBRANCH=	@HGBRANCH@
  
  GNULD=		@GNULD@
  
@@@ -552,10 -528,15 +555,15 @@@ Modules/getbuildinfo.o: $(PARSER_OBJS) 
  		$(SIGNAL_OBJS) \
  		$(MODOBJS) \
  		$(srcdir)/Modules/getbuildinfo.c
- 	$(CC) -c $(PY_CORE_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c
 -	$(CC) -c $(PY_CFLAGS) \
++	$(CC) -c $(PY_CORE_CFLAGS) \
+ 	      -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" \
+ 	      -DHGVERSION="\"`LC_ALL=C $(HGVERSION)`\"" \
+ 	      -DHGTAG="\"`LC_ALL=C $(HGTAG)`\"" \
+ 	      -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \
+ 	      -o $@ $(srcdir)/Modules/getbuildinfo.c
  
  Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
 -	$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
 +	$(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
  		-DPREFIX='"$(prefix)"' \
  		-DEXEC_PREFIX='"$(exec_prefix)"' \
  		-DVERSION='"$(VERSION)"' \
diff --cc Python/sysmodule.c
index de51155a49,f85cc55ad1..ea095d2660
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@@ -1598,8 -1356,11 +1598,11 @@@ _PySys_Init(void
                           PyLong_FromLong(PY_VERSION_HEX));
      svnversion_init();
      SET_SYS_FROM_STRING("subversion",
 -                        Py_BuildValue("(UUU)", "CPython", branch,
 +                        Py_BuildValue("(sss)", "CPython", branch,
                                        svn_revision));
+     SET_SYS_FROM_STRING("_mercurial",
+                         Py_BuildValue("(szz)", "CPython", _Py_hgidentifier(),
+                                       _Py_hgversion()));
      SET_SYS_FROM_STRING("dont_write_bytecode",
                           PyBool_FromLong(Py_DontWriteBytecodeFlag));
      SET_SYS_FROM_STRING("api_version",
diff --cc configure
index 96747ff784,1ef57d06bc..98ae6e651d
--- a/configure
+++ b/configure
@@@ -1,7 -1,7 +1,7 @@@
  #! /bin/sh
- # From configure.in Revision: 88430 .
+ # From configure.in Revision.
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.68 for python 3.1.
 +# Generated by GNU Autoconf 2.68 for python 3.2.
  #
  # Report bugs to <http://bugs.python.org/>.
  #