Switch everything from jhbuild to dn-build

7 files changed, 59 insertions, 144 deletions

diff --git a/scripts/modules/activities.json b/scripts/modules/activities.json
index 1abf756..e97a0fc 100644
--- a/scripts/modules/activities.json
+++ b/scripts/modules/activities.json
@@ -1,6 +1,7 @@
 [{ "name": "browse",
-   "repo": "git://git.sugarlabs.org/browse/mainline.git" },
+   "repo": "git://git.sugarlabs.org/browse/mainline.git",
+   "out-of-source": false },
  { "name": "chat",
    "repo": "git://git.sugarlabs.org/chat/mainline.git",
-   "branch": "gtk3" }
-]
+   "branch": "gtk3",
+   "out-of-source": false }]
diff --git a/scripts/modules/sugar.json b/scripts/modules/sugar.json
new file mode 100644
index 0000000..b9e659a
--- /dev/null
+++ b/scripts/modules/sugar.json
@@ -0,0 +1,12 @@
+[{ "name": "sugar-base",
+   "repo": "git://git.sugarlabs.org/sugar-base/mainline.git" },
+ { "name": "sugar-toolkit",
+   "repo": "git://git.sugarlabs.org/sugar-toolkit/mainline.git" },
+ { "name": "sugar-toolkit-gtk3",
+   "repo": "git://git.sugarlabs.org/sugar-toolkit-gtk3/sugar-toolkit-gtk3.git" },
+ { "name": "sugar",
+   "repo": "git://git.sugarlabs.org/sugar/mainline.git" },
+ { "name": "sugar-artwork",
+   "repo": "git://git.sugarlabs.org/sugar-artwork/mainline.git" },
+ { "name": "sugar-datastore",
+   "repo": "git://git.sugarlabs.org/sugar-datastore/mainline.git" }]
diff --git a/scripts/modules/sugar.modules b/scripts/modules/sugar.modules
deleted file mode 100644
index 1c506eb..0000000
--- a/scripts/modules/sugar.modules
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
-  <repository type="git" name="git.sugarlabs.org" default="yes"
-      href="git://git.sugarlabs.org"/>
-  <autotools id="sugar-base">
-    <branch module="sugar-base/mainline.git" checkoutdir="sugar-base"/>
-  </autotools>
-  <autotools id="sugar-toolkit">
-    <branch module="sugar-toolkit/mainline.git" checkoutdir="sugar-toolkit"/>
-    <dependencies>
-      <dep package="sugar-datastore"/>
-    </dependencies>
-  </autotools>
-  <autotools id="sugar-toolkit-gtk3">
-    <branch module="sugar-toolkit-gtk3/sugar-toolkit-gtk3.git" checkoutdir="sugar-toolkit-gtk3"/>
-    <dependencies>
-      <dep package="sugar-datastore"/>
-    </dependencies>
-  </autotools>
-  <autotools id="sugar">
-    <branch module="sugar/mainline.git" checkoutdir="sugar"/>
-    <dependencies>
-      <dep package="sugar-base"/>
-      <dep package="sugar-toolkit"/>
-      <dep package="sugar-artwork"/>
-    </dependencies>
-  </autotools>
-  <autotools id="sugar-artwork">
-    <branch module="sugar-artwork/mainline.git" checkoutdir="sugar-artwork"/>
-  </autotools>
-  <autotools id="sugar-datastore">
-    <branch module="sugar-datastore/mainline.git" checkoutdir="sugar-datastore"/>
-  </autotools>
-
-  <metamodule id="meta-sugar">
-    <dependencies>
-      <dep package="sugar-toolkit-gtk3"/>
-      <dep package="sugar"/>
-    </dependencies>
-  </metamodule>
-</moduleset>
diff --git a/scripts/modules/system-3.4.json b/scripts/modules/system-3.4.json
new file mode 100644
index 0000000..9ba12cd
--- /dev/null
+++ b/scripts/modules/system-3.4.json
@@ -0,0 +1,40 @@
+[{ "name": "glib",
+   "repo": "git://git.gnome.org/glib",
+   "branch": "2.34.2" },
+ { "name": "gobject-introspection",
+   "repo": "git://git.gnome.org/gobject-introspection",
+   "branch": "GOBJECT_INTROSPECTION_1_34_1_1" },
+ { "name": "pygobject",
+   "repo": "git://git.gnome.org/pygobject",
+   "branch": "3.4.2" },
+ { "name": "atk",
+   "repo": "git://git.gnome.org/atk",
+   "branch": "ATK_2_6_0" },
+ { "name": "at-spi2-core",
+   "repo": "git://git.gnome.org/at-spi2-core",
+   "branch": "AT_SPI2_CORE_2_6_1" },
+ { "name": "at-spi2-atk",
+   "repo": "git://git.gnome.org/at-spi2-atk",
+   "branch": "AT_SPI2_ATK_2_6_1" },
+ { "name": "gtk+",
+   "repo": "git://git.gnome.org/gtk+",
+   "branch": "3.6.1" },
+ { "name": "gstreamer",
+   "repo": "git://anongit.freedesktop.org/gstreamer/gstreamer",
+   "branch": "1.0.2",
+   "out-of-source": false },
+ { "name": "gst-plugins-base",
+   "repo": "git://anongit.freedesktop.org/gstreamer/gst-plugins-base",
+   "branch": "1.0.2",
+   "out-of-source": false },
+ { "name": "gst-plugins-good",
+   "repo": "git://anongit.freedesktop.org/gstreamer/gst-plugins-good",
+   "branch": "1.0.2",
+   "out-of-source": false },
+ { "name": "gst-plugins-espeak",
+   "repo": "git://git.sugarlabs.org/gst-plugins-espeak/mainline.git",
+   "branch": "v0.4.0",
+   "out-of-source": false },
+ { "name": "libxklavier",
+   "repo": "git://anongit.freedesktop.org/libxklavier",
+   "branch": "libxklavier-5.3" }]
diff --git a/scripts/modules/system-3.4.modules b/scripts/modules/system-3.4.modules
deleted file mode 100644
index 9d06150..0000000
--- a/scripts/modules/system-3.4.modules
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
-  <repository type="git" name="git.gnome.org" href="git://git.gnome.org"/>
-  <repository type="git" name="github.com/dnarvaez" href="git://github.com/dnarvaez"/>
-  <repository type="git" name="gstreamer.freedesktop.org" href="git://anongit.freedesktop.org/gstreamer/"/>
-  <repository type="git" name="freedesktop.org" href="git://anongit.freedesktop.org/"/>
-  <repository type="git" name="git.sugarlabs.org" href="git://git.sugarlabs.org"/>
-  <repository type="tarball" name="gnome.org" href="http://download.gnome.org/sources/"/>
-  <autotools id="gtk+">
-    <branch repo="git.gnome.org" revision="3.6.1"/>
-    <dependencies>
-      <dep package="atk"/>
-    </dependencies>
-  </autotools>
-  <autotools id="atk">
-    <branch repo="git.gnome.org" revision="ATK_2_6_0"/>
-    <dependencies>
-      <dep package="at-spi2-atk"/>
-    </dependencies>
-  </autotools>
-  <autotools id="at-spi2-atk">
-    <branch repo="git.gnome.org" revision="AT_SPI2_ATK_2_6_1"/>
-    <dependencies>
-      <dep package="at-spi2-core"/>
-    </dependencies>
-  </autotools>
-  <autotools id="at-spi2-core">
-    <branch repo="git.gnome.org" revision="AT_SPI2_CORE_2_6_1"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-  <autotools id="pygobject">
-    <branch repo="git.gnome.org" revision="3.4.1.1"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-  <autotools id="gobject-introspection">
-    <branch repo="git.gnome.org" revision="GOBJECT_INTROSPECTION_1_34_1_1"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-  <autotools id="glib">
-    <branch module="glib/2.34/glib-2.34.1.tar.xz" version="2.34.1"
-            repo="gnome.org"
-            hash="sha256:6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1"
-            size="6363332"/>
-  </autotools>
-  <autotools id="gstreamer" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" revision="1.0.2"/>
-  </autotools>
-  <autotools id="gst-plugins-base" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" revision="1.0.2"/>
-    <dependencies>
-      <dep package="gstreamer"/>
-    </dependencies>
-  </autotools>
-  <autotools id="gst-plugins-good" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" revision="1.0.2"/>
-    <dependencies>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-  </autotools>
-  <autotools id="gst-plugins-espeak" supports-non-srcdir-builds="no">
-    <branch repo="git.sugarlabs.org" module="gst-plugins-espeak/mainline.git"
-            revision="v0.4.0" checkoutdir="gst-plugins-espeak"/>
-  </autotools>
-  <autotools id="libxklavier">
-    <branch repo="freedesktop.org" revision="libxklavier-5.3"/>
-  </autotools>
-
-  <metamodule id="meta-system">
-    <dependencies>
-      <dep package="pygobject"/>
-      <dep package="gtk+"/>
-      <dep package="gst-plugins-good"/>
-      <dep package="gst-plugins-espeak"/>
-      <dep package="libxklavier"/>
-    </dependencies>
-  </metamodule>
-</moduleset>
diff --git a/scripts/modules/system-3.6.json b/scripts/modules/system-3.6.json
new file mode 100644
index 0000000..a868125
--- /dev/null
+++ b/scripts/modules/system-3.6.json
@@ -0,0 +1,3 @@
+[{ "name": "pygobject",
+   "repo": "git://git.gnome.org/pygobject",
+   "branch": "3.4.2" }]
diff --git a/scripts/modules/system-3.6.modules b/scripts/modules/system-3.6.modules
deleted file mode 100644
index 4fa1bc4..0000000
--- a/scripts/modules/system-3.6.modules
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
-  <repository type="git" name="github.com/dnarvaez" href="git://github.com/dnarvaez"/>
-  <autotools id="pygobject">
-    <branch repo="github.com/dnarvaez" revision="pygobject-3-4"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-  <metamodule id="meta-system">
-    <dependencies>
-      <dep package="pygobject"/>
-    </dependencies>
-  </metamodule>
-</moduleset>