[Python-checkins] r79116 - in python/branches/py3k: Makefile.pre.in Misc/NEWS Misc/python-config.in

Fri Mar 19 22:17:17 CET 2010

Author: collin.winter
Date: Fri Mar 19 22:17:17 2010
New Revision: 79116
Log:
Merged revisions 79082,79084 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r79082 | collin.winter | 2010年03月18日 17:00:30 -0700 (2010年3月18日) | 1 line
 
 Add a separate python-config make target, useful for testing changes to Misc/python-config.in.
........
 r79084 | collin.winter | 2010年03月18日 17:08:44 -0700 (2010年3月18日) | 1 line
 
 Make python-config support multiple option flags on the same command line, rather than requiring one invocation per flag.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Makefile.pre.in
 python/branches/py3k/Misc/NEWS
 python/branches/py3k/Misc/python-config.in
Modified: python/branches/py3k/Makefile.pre.in
==============================================================================

--- python/branches/py3k/Makefile.pre.in	(original)
+++ python/branches/py3k/Makefile.pre.in	Fri Mar 19 22:17:17 2010
@@ -941,6 +941,11 @@
 	export EXE; EXE="$(BUILDEXE)"; \
 	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
 
+python-config: $(srcdir)/Misc/python-config.in
+	# Substitution happens here, as the completely-expanded BINDIR
+	# is not available in configure
+	sed -e "s, at EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
+
 # Install the include files
 INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
 inclinstall:
@@ -966,7 +971,7 @@
 # pkgconfig directory
 LIBPC=		$(LIBDIR)/pkgconfig
 
-libainstall:	all
+libainstall:	all python-config
 	@for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \
 	do \
 		if test ! -d $(DESTDIR)$$i; then \
@@ -997,9 +1002,6 @@
 	$(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc
 	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
-	# Substitution happens here, as the completely-expanded BINDIR
-	# is not available in configure
-	sed -e "s, at EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
 	rm python-config
 	@if [ -s Modules/python.exp -a \
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Fri Mar 19 22:17:17 2010
@@ -889,6 +889,8 @@
 - Issue #7541: when using ``python-config`` with a framework install the
 compiler might use the wrong library.
 
+- python-config now supports multiple options on the same command line.
+
 Documentation
 ------------
 
Modified: python/branches/py3k/Misc/python-config.in
==============================================================================
--- python/branches/py3k/Misc/python-config.in	(original)
+++ python/branches/py3k/Misc/python-config.in	Fri Mar 19 22:17:17 2010
@@ -21,33 +21,36 @@
 if not opts:
 exit_with_usage()
 
-opt = opts[0][0]
-
 pyver = sysconfig.get_config_var('VERSION')
 getvar = sysconfig.get_config_var
 
-if opt == '--help':
- exit_with_usage(0)
-
-elif opt == '--prefix':
- print(sysconfig.PREFIX)
+opt_flags = [flag for (flag, val) in opts]
 
-elif opt == '--exec-prefix':
- print(sysconfig.EXEC_PREFIX)
+if '--help' in opt_flags:
+ exit_with_usage(code=0)
 
-elif opt in ('--includes', '--cflags'):
- flags = ['-I' + sysconfig.get_python_inc(),
- '-I' + sysconfig.get_python_inc(plat_specific=True)]
- if opt == '--cflags':
- flags.extend(getvar('CFLAGS').split())
- print(' '.join(flags))
-
-elif opt in ('--libs', '--ldflags'):
- libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
- libs.append('-lpython'+pyver)
- # add the prefix/lib/pythonX.Y/config dir, but only if there is no
- # shared library in prefix/lib/.
- if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
- libs.insert(0, '-L' + getvar('LIBPL'))
- print(' '.join(libs))
+for opt in opt_flags:
+ if opt == '--prefix':
+ print(sysconfig.PREFIX)
+
+ elif opt == '--exec-prefix':
+ print(sysconfig.EXEC_PREFIX)
+
+ elif opt in ('--includes', '--cflags'):
+ flags = ['-I' + sysconfig.get_python_inc(),
+ '-I' + sysconfig.get_python_inc(plat_specific=True)]
+ if opt == '--cflags':
+ flags.extend(getvar('CFLAGS').split())
+ print(' '.join(flags))
+
+ elif opt in ('--libs', '--ldflags'):
+ libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
+ libs.append('-lpython'+pyver)
+ # add the prefix/lib/pythonX.Y/config dir, but only if there is no
+ # shared library in prefix/lib/.
+ if opt == '--ldflags':
+ if not getvar('Py_ENABLE_SHARED'):
+ libs.insert(0, '-L' + getvar('LIBPL'))
+ libs.extend(getvar('LINKFORSHARED').split())
+ print(' '.join(libs))
 
