gobject-introspection r965 - trunk/giscanner

[tko svn gnome org]

Author: tko
Date: Tue Nov 25 17:02:43 2008
New Revision: 965
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=965&view=rev

Log:
prefer uninstalled libraries to installed ones

	* giscanner/dumper.py (_link): prefer uninstalled libraries to
	installed ones so that we don't introspect an older, installed
	version

Modified:
   trunk/giscanner/dumper.py

Modified: trunk/giscanner/dumper.py
==============================================================================
--- trunk/giscanner/dumper.py	(original)
+++ trunk/giscanner/dumper.py	Tue Nov 25 17:02:43 2008
@@ -163,6 +163,19 @@
             args.extend(['libtool', '--mode=link'])
 
         args.extend([self._linker_cmd, '-o', output])
+
+        # Make sure to list the library to be introspected first since it's
+        # likely to be uninstalled yet and we want the uninstalled RPATHs have
+        # priority (or we might run with installed library that is older)
+
+        # Search the current directory first
+        args.append('-L.')
+
+        # We only use the first library; assume others are "custom" libraries
+        # like from gir-repository.  Right now those don't define new GTypes,
+        # so we don't need to introspect them.
+        args.append('-l' + self._options.libraries[0])
+
         args.extend(self._run_pkgconfig('--libs'))
         for source in sources:
             if not os.path.exists(source):
@@ -177,13 +190,6 @@
                                 'libgirepository.la')
             args.append(path)
 
-        # Search the current directory first
-        args.append('-L.')
-
-        # We only use the first library; assume others are "custom" libraries
-        # like from gir-repository.  Right now those don't define new GTypes,
-        # so we don't need to introspect them.
-        args.append('-l' + self._options.libraries[0])
         subprocess.check_call(args)