From 2d02f147aa9a35f9753804f1f693653641fa239f Mon Sep 17 00:00:00 2001
From: Bernie Innocenti <bernie@codewiz.org>
Date: Sun, 25 Apr 2010 17:36:18 +0000
Subject: Move etoys to the extra-activities group

This change considerably speeds up building the default target.
As discussed on sugar-devel@, Etoys developers don't work in
jhbuild, and Sugar core developers rarely need to test their
changes against Etoys.

To build Etoys and its dependencies, simply do one of:

 ./sugar-jhbuild build etoys
 ./sugar-jhbuild build meta-extra-activities

Acked-By: Sascha Silbe <sascha-pgp@silbe.org>
Signed-off-by: Bernie Innocenti <bernie@codewiz.org>
---
diff --git a/config/modulesets/extra-activities.modules b/config/modulesets/extra-activities.modules
index eba0bca..2a1123d 100644
--- a/config/modulesets/extra-activities.modules
+++ b/config/modulesets/extra-activities.modules
@@ -10,6 +10,10 @@
   <repository type="svn" name="penguintv.sf.net"
       href="https://penguintv.svn.sourceforge.net/svnroot/penguintv/" />
 
+  <autotools id="etoys">
+    <branch repo="dev.laptop.org/projects" />
+    <dep package="squeak" />
+  </autotools>
   <bundle id="penguintv">
     <branch repo="penguintv.sf.net" module="trunk" checkoutdir="penguintv" />
   </bundle>
@@ -58,6 +62,7 @@
   </bundle>
   <metamodule id="meta-extra-activities">
     <dependencies>
+      <dep package="etoys"/>
       <dep package="penguintv"/>
       <dep package="video-chat-activity"/>
       <dep package="connect-activity"/>
diff --git a/config/modulesets/fructose.modules b/config/modulesets/fructose.modules
index 73a14e4..72369f3 100644
--- a/config/modulesets/fructose.modules
+++ b/config/modulesets/fructose.modules
@@ -30,9 +30,6 @@
   <bundle id="write">
     <branch module="write/mainline.git" checkoutdir="write" />
   </bundle>
-  <autotools id="etoys">
-    <branch repo="dev.laptop.org/projects" />
-  </autotools>
   <bundle id="calculate">
     <branch module="calculate/mainline.git" checkoutdir="calculate" />
   </bundle>
@@ -51,7 +48,6 @@
 
   <metamodule id="meta-fructose">
     <dependencies>
-      <dep package="etoys"/>
       <dep package="read"/>
       <dep package="browse"/>
       <dep package="chat"/>
diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
index cd3ea67..2a9a8ce 100644
--- a/config/modulesets/glucose.modules
+++ b/config/modulesets/glucose.modules
@@ -51,7 +51,6 @@
       <dep package="sugar"/>
       <dep package="pyabiword"/>
       <dep package="abiword-plugins"/>
-      <dep package="squeak"/>
       <dep package="gnome-python-desktop"/>
       <dep package="hulahop"/>
     </dependencies>
--
cgit v0.9.1