Support release directory inside modulesets.

2 files changed, 17 insertions, 7 deletions

diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
index ae0c83e..35f5d35 100644
--- a/config/modulesets/glucose.modules
+++ b/config/modulesets/glucose.modules
@@ -5,7 +5,6 @@
       href="git://dev.laptop.org/"/>
   <repository type="git" name="dev.laptop.org/projects"
       href="git://dev.laptop.org/projects/"/>
-  <include href="glucose-external.modules"/>
   <autotools id="sugar-base">
     <branch repo="dev.laptop.org"/>
     <dependencies>
diff --git a/scripts/config.py b/scripts/config.py
index 041dcba..6fa1f86 100644
--- a/scripts/config.py
+++ b/scripts/config.py
@@ -9,6 +9,7 @@ class Config(jhbuild.config.Config):
     def __init__(self, rc_file):
         scripts_dir = os.path.dirname(__file__)
         self._base_dir = os.path.dirname(scripts_dir)
+        self._set_dir = os.path.join(self._base_dir, 'config', 'modulesets')
 
         jhbuild.config.Config.__init__(self, self._ensure_rc_file(rc_file))
 
@@ -25,12 +26,19 @@ class Config(jhbuild.config.Config):
         self.autogenargs = ''
 
         self.moduleset = []
+        self._add_moduleset('glucose-external.modules')
         self._add_moduleset('tools.modules')
-        self._add_moduleset('glucose.modules')
-        self._add_moduleset('fructose.modules')
         self._add_moduleset('extra.modules')
         self._add_moduleset('extra-activities.modules')
 
+        release_dir = None
+        for f in os.listdir(self._set_dir):
+            if f.startswith('release-'):
+                release_dir = f
+
+        self._add_moduleset('glucose.modules', release_dir)
+        self._add_moduleset('fructose.modules', release_dir)
+
         self.modules = [ 'meta-tools',
                          'meta-glucose',
                          'meta-fructose' ]
@@ -42,10 +50,13 @@ class Config(jhbuild.config.Config):
             if source and source not in self.skip:
                 self.skip.append(source)
 
-    def _add_moduleset(self, moduleset):
-        set_path = os.path.join(self._base_dir, 'config',
-                                'modulesets', moduleset)
-        self.moduleset.append(set_path)
+    def _add_moduleset(self, moduleset, release_dir=None):
+        if release_dir:
+            path = os.path.join(self._set_dir, release_dir)
+        else:
+            path = self._set_dir
+
+        self.moduleset.append(os.path.join(path, moduleset))
 
     def setup_env(self):
         self.prefix = os.path.join(self._base_dir, 'install')