jhbuild r2485 - in trunk: . jhbuild/modtypes

[fpeters svn gnome org]

Author: fpeters
Date: Sun Nov  9 14:21:20 2008
New Revision: 2485
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2485&view=rev

Log:
* jhbuild/modtypes/autotools.py: make sure autogen.sh/configure are
executable.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/modtypes/autotools.py

Modified: trunk/jhbuild/modtypes/autotools.py
==============================================================================
--- trunk/jhbuild/modtypes/autotools.py	(original)
+++ trunk/jhbuild/modtypes/autotools.py	Sun Nov  9 14:21:20 2008
@@ -22,6 +22,7 @@
 
 import os
 import re
+import stat
 
 from jhbuild.errors import FatalError, BuildStateError, CommandError
 from jhbuild.modtypes import \
@@ -130,13 +131,16 @@
             os.makedirs(builddir)
         buildscript.set_action(_('Configuring'), self)
 
+        srcdir = self.get_srcdir(buildscript)
         if self.autogen_sh == 'autogen.sh':
             # if there is no autogen.sh, automatically fallback to configure
-            srcdir = self.get_srcdir(buildscript)
             if not os.path.exists(os.path.join(srcdir, 'autogen.sh')) and \
                     os.path.exists(os.path.join(srcdir, 'configure')):
                 self.autogen_sh = 'configure'
 
+        if not (os.stat(os.path.join(srcdir, self.autogen_sh))[stat.ST_MODE] & 0111):
+            os.chmod(os.path.join(srcdir, self.autogen_sh), 0755)
+
         if self.autogen_template:
             template = self.autogen_template
         else: