From b8b6bd4cd421ebab90a40e7d0aee9e5aebcfa00f Mon Sep 17 00:00:00 2001
From: Bernie Innocenti <bernie@codewiz.org>
Date: Sat, 23 May 2009 10:43:32 +0000
Subject: Move etoys from fructose to its own module

Etoys and its dependency squeak take a lot of time to build,
and few developers actually need it in order to hack on Sugar
itself.

You can build etoys separately by issuing the following command:

   ./sugar-jhbuild build etoys
---
diff --git a/config/modulesets/etoys.modules b/config/modulesets/etoys.modules
new file mode 100644
index 0000000..0ef37b9
--- /dev/null
+++ b/config/modulesets/etoys.modules
@@ -0,0 +1,23 @@
+<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <repository type="svn" name="squeakvm.org"
+	href="http://squeakvm.org/svn/squeak/branches/" trunk-template="olpc"/>
+
+  <autotools id="squeak">
+    <branch repo="squeakvm.org" module="olpc" checkoutdir="squeak"/>
+  </autotools>
+
+  <autotools id="etoys">
+    <branch repo="dev.laptop.org/projects" />
+    <dependencies>
+      <dep package="squeak"/>
+    </dependencies>
+  </autotools>
+
+  <metamodule id="meta-etoys">
+    <dependencies>
+      <dep package="etoys"/>
+    </dependencies>
+  </metamodule>
+</moduleset>
diff --git a/config/modulesets/extra-activities.modules b/config/modulesets/extra-activities.modules
index eba0bca..2ee9dcb 100644
--- a/config/modulesets/extra-activities.modules
+++ b/config/modulesets/extra-activities.modules
@@ -73,6 +73,7 @@
       <dep package="flipsticks"/>
       <dep package="analyze-activity"/>
       <dep package="acoustic-measure-activity"/>
+      <dep package="meta-etoys"/>
     </dependencies>
   </metamodule>
 </moduleset>
diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index ee3943f..3189486 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -5,8 +5,6 @@
       href="git://dev.laptop.org/projects/" />
   <repository type="svn" name="svn.gnome.org"
       href="http://svn.gnome.org/svn/"/>
-  <repository type="svn" name="squeakvm.org"
-        href="http://squeakvm.org/svn/squeak/branches/" trunk-template="olpc"/>
   <repository type="git" name="git.imendio.com"
       href="git://git.imendio.com/projects/"/>
   <repository type="svn" name="matchbox.o-hand.com"
@@ -69,11 +67,6 @@
       <dep package="abiword"/>
     </dependencies>
   </tarball>
-  <autotools id="squeak">
-    <branch repo="squeakvm.org" module="olpc" checkoutdir="squeak"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
   <autotools id="hulahop">
     <branch module="hulahop/mainline.git" checkoutdir="hulahop"/>
     <dependencies>
diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
index 29e1c1e..ccef1d4 100644
--- a/config/modulesets/glucose.modules
+++ b/config/modulesets/glucose.modules
@@ -50,7 +50,6 @@
       <dep package="sugar"/>
       <dep package="pyabiword"/>
       <dep package="abiword-plugins"/>
-      <dep package="squeak"/>
       <dep package="gnome-python-desktop"/>
       <dep package="hulahop"/>
       <dep package="sugar-update-control"/>
--
cgit v0.9.1