diff options
| -rw-r--r-- | config/deps/sugar-runtime.json | 15 | ||||
| -rw-r--r-- | config/modules/system.json | 23 | ||||
| -rw-r--r-- | config/packages/deps.json | 22 | ||||
| -rw-r--r-- | devbot/build.py | 6 | ||||
| -rw-r--r-- | devbot/config.py | 2 |
5 files changed, 62 insertions, 6 deletions
diff --git a/config/deps/sugar-runtime.json b/config/deps/sugar-runtime.json index 603a14d..d26131e 100644 --- a/config/deps/sugar-runtime.json +++ b/config/deps/sugar-runtime.json @@ -10,6 +10,21 @@ "name": "X" }, { + "check": "dbus-glib-1", + "checker": "pkgconfig", + "name": "dbus-glib-1" + }, + { + "check": "expat", + "checker": "pkgconfig", + "name": "expat" + }, + { + "check": "X", + "checker": "binary", + "name": "X" + }, + { "check": "autodetect", "checker": "gstreamer-1.0", "if": "gstreamer_version == '1.0'", diff --git a/config/modules/system.json b/config/modules/system.json index eda65a9..3279428 100644 --- a/config/modules/system.json +++ b/config/modules/system.json @@ -1,16 +1,27 @@ [ { - "branch": "sugar-build-v1.11.6", - "name": "automake", - "repo": "git://github.com/dnarvaez/automake.git" - }, - { "name": "node", "options_ev": [ "'--prefix=%s' % prefix" ], "out-of-source": false, - "repo": "git://github.com/joyent/node.git" + "repo": "git://github.com/joyent/node.git", + "tag": "v0.8.18-release" + }, + { + "name": "node-dbus", + "out-of-source": false, + "repo": "git://github.com/Shouqun/node-dbus.git" + }, + { + "name": "node-static", + "out-of-source": false, + "repo": "git://github.com/cloudhead/node-static.git" + }, + { + "branch": "sugar-build-v1.11.6", + "name": "automake", + "repo": "git://github.com/dnarvaez/automake.git" }, { "branch": "gnome-3-4", diff --git a/config/packages/deps.json b/config/packages/deps.json index e13ff86..3824272 100644 --- a/config/packages/deps.json +++ b/config/packages/deps.json @@ -1,4 +1,26 @@ { + "expat": { + "debian": [ + "libexpat1-dev" + ], + "fedora": [ + "expat-devel" + ], + "ubuntu": [ + "libexpat1-dev" + ] + }, + "dbus-glib-1": { + "debian": [ + "libdbus-glib-1-dev" + ], + "fedora": [ + "dbus-glib-devel" + ], + "ubuntu": [ + "libdbus-glib-1-dev" + ] + }, "Adwaita": { "debian": [ "gnome-themes-standard" diff --git a/devbot/build.py b/devbot/build.py index bfb2ce8..23e70e7 100644 --- a/devbot/build.py +++ b/devbot/build.py @@ -177,6 +177,12 @@ def _build_activity(module, log): _builders["activity"] = _build_activity +def _build_node(module, log): + command.run(["npm", "install", "-g"], log) + +_builders["node"] = _build_node + + def _distribute_autotools(module): makefile = parse_makefile("Makefile") filename = makefile["DIST_ARCHIVES"] diff --git a/devbot/config.py b/devbot/config.py index 17283c8..05ffcca 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -57,6 +57,8 @@ class Module: elif os.path.exists(os.path.join(source_dir, "autogen.sh")) or \ os.path.exists(os.path.join(source_dir, "configure")): return "autotools" + elif os.path.exists(os.path.join(source_dir, "package.json")): + return "node" else: print("The source directory has unexpected content, please " "delete it and pull\nthe source again.") |