Mercurial > gub

changeset 5207:94aeca28b98e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc.python_dump_script (): new function. Use it in python_dump_config.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 06 Apr 2009 16:27:04 +0200
parents c67a6dcf05c1
children fc44e2ec2b64
files gub/misc.py sourcefiles/python-config.py sourcefiles/python-config.py.in
diffstat 3 files changed, 88 insertions(+), 82 deletions(-) [+]
line wrap: on
line diff
--- a/gub/misc.py	Fri Apr 03 19:42:15 2009 +0200
+++ b/gub/misc.py	Mon Apr 06 16:27:04 2009 +0200
@@ -609,10 +609,11 @@
     def __repr__ (self):
         return '<Url:' + self.__dict__.__repr__ () + '>'
 
-def dump_python_config (self):
-    dir = self.expand ('%(install_prefix)s%(cross_dir)s/bin')
+def dump_python_script (self, bindir, name):
+    dir = self.expand (bindir)
     self.system ('mkdir -p %(dir)s' % locals ())
-    python_config = '%(dir)s/python-config' % locals ()
+    script = '%(dir)s/%(name)s' % locals ()
+    source = '%(sourcefiledir)s/' + '%(name)s.py' % locals ()
     self.file_sub ([
          ('@PREFIX@', self.expand ('%(system_prefix)s')),
          # FIXME: better use %(tools_prefix)s/bin/python?
@@ -620,11 +621,16 @@
          # python-config, while we are building python2.4.
          ## ('@PYTHON_FOR_BUILD@', sys.executable),
          ('@PYTHON_FOR_BUILD@', self.expand ('%(tools_prefix)s/bin/python')),
+         ('@PYTHON@', self.expand ('%(tools_prefix)s/bin/python')),
+         ('@TARGET_PYTHON@', self.expand ('%(system_prefix)s/bin/python')),
          ('@PYTHON_VERSION@', self.expand ('%(version)s')),
          ('@EXTRA_LDFLAGS@', ''),],
-         '%(sourcefiledir)s/python-config.py.in',
-         to_name=python_config)
-    self.chmod (python_config, octal.o755)
+         source,
+         to_name=script)
+    self.chmod (script, octal.o755)
+
+def dump_python_config (self):
+    dump_python_script (self, '%(install_prefix)s%(cross_dir)s/bin', 'python-config')
 
 def librestrict ():
     return list (sorted (os.environ.get ('LIBRESTRICT',
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sourcefiles/python-config.py	Mon Apr 06 16:27:04 2009 +0200
@@ -0,0 +1,76 @@
+#! @PYTHON_FOR_BUILD@
+
+import optparse
+import sys
+
+sys.version = '@PYTHON_VERSION@'
+
+p = optparse.OptionParser ()
+p.description = 'Python compile time configuration'
+
+p.add_option ('', '--ldflags',
+              default='',
+              dest="ldflags",
+              action="store_true",
+              help="show ldflags")
+
+p.add_option ('', '--libs',
+              default='',
+              dest="ldflags",
+              action="store_true",
+              help="show ldflags")
+
+p.add_option ('', '--cflags',
+              default=None,
+              action="store_true",
+              dest="cflags",
+              help="show cflags")
+
+p.add_option ('', '--includes',
+              default=None,
+              action="store_true",
+              dest="cflags",
+              help="show cflags")
+
+p.add_option ('', '--verbose',
+              action="store_true",
+              default=False,
+              dest="verbose",
+              help="be verbose")
+
+p.add_option ('', '--prefix',
+              default=None,
+              dest="prefix",
+              help="set prefix")
+
+(options, args) = p.parse_args ()
+
+from distutils import sysconfig
+
+sysconfig.PREFIX = '@PREFIX@'
+sysconfig.EXEC_PREFIX = '@PREFIX@'
+
+if options.prefix:
+    sysconfig.EXEC_PREFIX = options.prefix
+    sysconfig.PREFIX = options.prefix
+
+if options.cflags:
+    sys.stdout.write ('-I%s\n' % sysconfig.get_python_inc ())
+
+if options.ldflags:
+    extra = "@EXTRA_LDFLAGS@"
+    if 0:
+        mf = sysconfig.get_makefile_filename()
+        d = sysconfig.parse_makefile (mf)
+        if options.verbose:
+            sys.stderr.write (mf + '\n')
+        # Using flags from native python build is asking for trouble,
+        # ie, arch or $$ORIGIN may break things.
+        extra  = d['LDFLAGS']
+        
+    sys.stdout.write ('-L%s -L%s %s\n'
+                      % (sysconfig.get_python_lib (),
+                         sysconfig.PREFIX + '/lib/',
+                         extra))
+
+## -*-Python-*-
--- a/sourcefiles/python-config.py.in	Fri Apr 03 19:42:15 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-#! @PYTHON_FOR_BUILD@
-
-import optparse
-import sys
-
-sys.version = '@PYTHON_VERSION@'
-
-p = optparse.OptionParser ()
-p.description = 'Python compile time configuration'
-
-p.add_option ('', '--ldflags',
-              default='',
-              dest="ldflags",
-              action="store_true",
-              help="show ldflags")
-
-p.add_option ('', '--libs',
-              default='',
-              dest="ldflags",
-              action="store_true",
-              help="show ldflags")
-
-p.add_option ('', '--cflags',
-              default=None,
-              action="store_true",
-              dest="cflags",
-              help="show cflags")
-
-p.add_option ('', '--includes',
-              default=None,
-              action="store_true",
-              dest="cflags",
-              help="show cflags")
-
-p.add_option ('', '--verbose',
-              action="store_true",
-              default=False,
-              dest="verbose",
-              help="be verbose")
-
-p.add_option ('', '--prefix',
-              default=None,
-              dest="prefix",
-              help="set prefix")
-
-(options, args) = p.parse_args ()
-
-from distutils import sysconfig
-
-sysconfig.PREFIX = '@PREFIX@'
-sysconfig.EXEC_PREFIX = '@PREFIX@'
-
-if options.prefix:
-    sysconfig.EXEC_PREFIX = options.prefix
-    sysconfig.PREFIX = options.prefix
-
-if options.cflags:
-    sys.stdout.write ('-I%s\n' % sysconfig.get_python_inc ())
-
-if options.ldflags:
-    extra = "@EXTRA_LDFLAGS@"
-    if 0:
-        mf = sysconfig.get_makefile_filename()
-        d = sysconfig.parse_makefile (mf)
-        if options.verbose:
-            sys.stderr.write (mf + '\n')
-        # Using flags from native python build is asking for trouble,
-        # ie, arch or $$ORIGIN may break things.
-        extra  = d['LDFLAGS']
-        
-    sys.stdout.write ('-L%s -L%s %s\n'
-                      % (sysconfig.get_python_lib (),
-                         sysconfig.PREFIX + '/lib/',
-                         extra))
-
-## -*-Python-*-