jhbuild r2269 - in trunk: . jhbuild modulesets

[fpeters svn gnome org]

Author: fpeters
Date: Sun Aug 17 09:45:31 2008
New Revision: 2269
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2269&view=rev

Log:
* jhbuild/moduleset.py, modulesets/gnome-2.24.modules: ignore missing
modules when constructing the GTK+ module list; also removed module
gtksourceviewmm-1.0 as gtksourceview-1.0 has been removed.
(closes: #548082)



Modified:
   trunk/ChangeLog
   trunk/jhbuild/moduleset.py
   trunk/modulesets/gnome-2.24.modules

Modified: trunk/jhbuild/moduleset.py
==============================================================================
--- trunk/jhbuild/moduleset.py	(original)
+++ trunk/jhbuild/moduleset.py	Sun Aug 17 09:45:31 2008
@@ -57,8 +57,8 @@
                 return self.modules[module]
         raise KeyError(module_name)
 
-    def get_module_list(self, seed, skip=[], tags=[], ignore_cycles = False,
-                include_optional_modules = False):
+    def get_module_list(self, seed, skip=[], tags=[], ignore_cycles=False,
+                include_optional_modules=False, ignore_missing=False):
         '''gets a list of module objects (in correct dependency order)
         needed to build the modules in the seed list'''
 
@@ -78,7 +78,10 @@
             for modname in all_modules[i].dependencies:
                 depmod = self.modules.get(modname)
                 if not depmod:
-                    raise UsageError(_('dependent module "%s" not found') % modname)
+                    if not ignore_missing:
+                        raise UsageError(_('dependent module "%s" not found') % modname)
+                    del all_modules[i]
+                    continue
                 if not depmod in all_modules:
                     all_modules.append(depmod)
 
@@ -151,7 +154,7 @@
     
     def get_full_module_list(self, skip=[], ignore_cycles=False):
         return self.get_module_list(self.modules.keys(), skip=skip,
-                ignore_cycles=ignore_cycles)
+                ignore_cycles=ignore_cycles, ignore_missing=True)
 
     def get_test_module_list (self, seed, skip=[]):
         test_modules = []

Modified: trunk/modulesets/gnome-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-2.24.modules	(original)
+++ trunk/modulesets/gnome-2.24.modules	Sun Aug 17 09:45:31 2008
@@ -501,15 +501,6 @@
     </dependencies>
   </autotools>
 
-  <tarball id="gtksourceviewmm-1.0" version="0.3.1">
-    <source href="http://ftp.gnome.org/pub/GNOME/sources/libgtksourceviewmm/0.3/libgtksourceviewmm-0.3.1.tar.gz";
-            md5sum="f778768bfbddfb363ae234b19cd0d818" size="568777"/>
-    <dependencies>
-      <dep package="gtksourceview-1.0"/>
-      <dep package="gtkmm"/>
-    </dependencies>
-  </tarball>
-
   <autotools id="goocanvasmm">
     <branch repo="svn.gnomemm" />
     <dependencies>