Get framework/activities installation back

2 files changed, 12 insertions, 5 deletions

diff --git a/config.py b/config.py
index 9fee210..328699e 100644
--- a/config.py
+++ b/config.py
@@ -14,8 +14,12 @@ class Config(jhbuild.config.Config):
     def _setup(self):
         self.moduleset = []
         self._add_moduleset('sugar-base.modules')
+        self._add_moduleset('sugar-framework.modules')
+        self._add_moduleset('sugar-activities.modules')
+        self._add_moduleset('sugar-extras.modules')
 
-        self.modules = [ 'meta-sugar-base' ]
+        self.modules = [ 'meta-sugar-framework',
+                         'meta-sugar-activities' ]
 
         self.checkoutroot = os.path.join(self._base_dir, 'source')
 
diff --git a/sugar-jhbuild b/sugar-jhbuild
index aecca99..828cff8 100755
--- a/sugar-jhbuild
+++ b/sugar-jhbuild
@@ -9,14 +9,17 @@ sys.path.append(os.path.join(base_dir, 'build-scripts', 'jhbuild'))
 import jhbuild.commands
 
 from config import Config
+import bundlemodule
 
 config = Config(base_dir)
 
+args = []
+command = 'build'
+
+if len(sys.argv) > 0:
+    command = sys.argv[1]
+
 if len(sys.argv) > 1:
-	command = sys.argv[1]
 	args = sys.argv[2:]
-else:
-	command = 'build'
-	args = sys.argv[1:]
 
 jhbuild.commands.run(command, config, args)