jhbuild r2306 - in trunk: . doc doc/C jhbuild

[fpeters svn gnome org]

Author: fpeters
Date: Sun Aug 24 15:22:30 2008
New Revision: 2306
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2306&view=rev

Log:
* jhbuild/config.py, jhbuild/defaults.jhbuildrc: expose installprog
configuration variable, and defaults to install-check.

* doc/C/jhbuild.xml: removed setting of os.environ['INSTALL'] in sample
minimalistic jhbuildrc as it is now done automatically, and through
the installprog configuration variable.



Modified:
   trunk/ChangeLog
   trunk/doc/C/jhbuild.xml
   trunk/doc/ChangeLog
   trunk/jhbuild/config.py
   trunk/jhbuild/defaults.jhbuildrc

Modified: trunk/doc/C/jhbuild.xml
==============================================================================
--- trunk/doc/C/jhbuild.xml	(original)
+++ trunk/doc/C/jhbuild.xml	Sun Aug 24 15:22:30 2008
@@ -177,8 +177,6 @@
 modules = [ 'meta-gnome-desktop' ]
 checkoutroot = os.path.join(os.environ['HOME'], 'checkout', 'gnome2')
 prefix = os.path.join(os.environ['HOME'], 'prefix')
-os.environ['INSTALL'] = os.path.join(os.environ['HOME'],
-                                     'bin', 'install-check')
 </programlisting>
 
       <para>This will make JHBuild build the
@@ -186,10 +184,7 @@
       dependencies from the <systemitem>gnome-2.22</systemitem> module
       set.  It will unpack source trees to
       <filename>~/checkout/gnome2</filename> and install all files to
-      subdirectories of <filename>~/prefix</filename>.  It also sets the
-      <envar>INSTALL</envar> environment variable, so modules use a
-      different install program which handles installation of headers
-      differently, in order to reduce the time taken for rebuilds.</para>
+      subdirectories of <filename>~/prefix</filename>.</para>
 
       <para>Some of configuration variables available include:</para>
 
@@ -1254,6 +1249,17 @@
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
+	  <term><varname>installprog</varname></term>
+	  <listitem>
+	    <simpara>A string specifying which program to use as
+	    replacement for <literal>/usr/bin/install</literal>; if available
+	    it defaults to the <literal>install-check</literal> wrapper provided
+	    by JHBuild, which handles installation of headers differently,
+	    in order to reduce the time taken for rebuilds.
+	    </simpara>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
 	  <term><varname>interact</varname></term>
 	  <listitem>
 	    <simpara>A boolean value specifying whether to interact

Modified: trunk/jhbuild/config.py
==============================================================================
--- trunk/jhbuild/config.py	(original)
+++ trunk/jhbuild/config.py	Sun Aug 24 15:22:30 2008
@@ -32,7 +32,7 @@
 
 _known_keys = [ 'moduleset', 'modules', 'skip', 'tags', 'prefix',
                 'checkoutroot', 'buildroot', 'autogenargs', 'makeargs',
-                'repos', 'branches', 'noxvfb', 'xvfbargs',
+                'installprog', 'repos', 'branches', 'noxvfb', 'xvfbargs',
                 'builddir_pattern', 'module_autogenargs', 'module_makeargs',
                 'interact', 'buildscript', 'nonetwork',
                 'alwaysautogen', 'nobuild', 'makeclean', 'makecheck', 'module_makecheck',
@@ -121,7 +121,7 @@
         # environment variables
         if config.has_key('cflags') and config['cflags']:
             os.environ['CFLAGS'] = config['cflags']
-        if config.has_key('installprog') and config['installprog']:
+        if config.has_key('installprog') and os.path.exists(config['installprog']):
             os.environ['INSTALL'] = config['installprog']
 
         # copy known config keys to attributes on the instance

Modified: trunk/jhbuild/defaults.jhbuildrc
==============================================================================
--- trunk/jhbuild/defaults.jhbuildrc	(original)
+++ trunk/jhbuild/defaults.jhbuildrc	Sun Aug 24 15:22:30 2008
@@ -44,7 +44,11 @@
 autogenargs = '--disable-static --disable-gtk-doc'
 makeargs = ''
 cflags = ''
-installprog = None
+installprog = os.path.join(os.environ['HOME'], 'bin', 'install-check')
+if not os.path.exists(installprog):
+    installprog = '/usr/bin/install-check'
+if not os.path.exists(installprog):
+    installprog = None
 
 # override cvs roots, branch tags, etc
 repos = {}