Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernie Innocenti <bernie@codewiz.org>2009-05-23 16:05:12 (GMT)
committer Bernie Innocenti <bernie@codewiz.org>2009-05-23 16:05:12 (GMT)
commit036da89dd3a75636434a25cc075655445cd2bbfd (patch)
treea310fa3002b35ef1c35c9edf4f9210bd57a48158
parentc3b471c396c0862a47eb77c2ccde85a3ba5fb83f (diff)
Fixups for streamlined build
These are a few required changes that were missing in the previous patch.
-rw-r--r--config/modulesets/etoys.modules2
-rw-r--r--config/modulesets/fructose.modules1
-rw-r--r--config/modulesets/sugar.modules2
3 files changed, 3 insertions, 2 deletions
diff --git a/config/modulesets/etoys.modules b/config/modulesets/etoys.modules
index 0ef37b9..faf9ec3 100644
--- a/config/modulesets/etoys.modules
+++ b/config/modulesets/etoys.modules
@@ -3,6 +3,8 @@
<moduleset>
<repository type="svn" name="squeakvm.org"
href="http://squeakvm.org/svn/squeak/branches/" trunk-template="olpc"/>
+ <repository type="git" name="dev.laptop.org/projects"
+ href="git://dev.laptop.org/projects/" />
<autotools id="squeak">
<branch repo="squeakvm.org" module="olpc" checkoutdir="squeak"/>
diff --git a/config/modulesets/fructose.modules b/config/modulesets/fructose.modules
index 73a14e4..e163b76 100644
--- a/config/modulesets/fructose.modules
+++ b/config/modulesets/fructose.modules
@@ -51,7 +51,6 @@
<metamodule id="meta-fructose">
<dependencies>
- <dep package="etoys"/>
<dep package="read"/>
<dep package="browse"/>
<dep package="chat"/>
diff --git a/config/modulesets/sugar.modules b/config/modulesets/sugar.modules
index a4bfb91..1fb0744 100644
--- a/config/modulesets/sugar.modules
+++ b/config/modulesets/sugar.modules
@@ -2,12 +2,12 @@
<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
<moduleset>
- <include href="tools.modules"/>
<include href="glucose-external.modules"/>
<include href="glucose.modules"/>
<include href="fructose.modules"/>
<include href="extra.modules"/>
<include href="extra-activities.modules"/>
+ <include href="etoys.modules"/>
<include href="buildbot.modules"/>
<metamodule id="meta-sugar">
<dependencies>