From d167dc41a48b1cc49c5e727d81600154e5838cad Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Sun, 09 Dec 2012 17:24:10 +0000 Subject: Build activities out-of-source --- diff --git a/config/modules/activities.json b/config/modules/activities.json index 4766f7f..3f6db9e 100644 --- a/config/modules/activities.json +++ b/config/modules/activities.json @@ -1,46 +1,38 @@ [ { "name": "browse", - "out-of-source": false, "repo": "git://git.sugarlabs.org/browse/mainline.git" }, { "branch": "gtk3", "name": "chat", - "out-of-source": false, "repo": "git://git.sugarlabs.org/chat/mainline.git" }, { "name": "read", - "out-of-source": false, "repo": "git://git.sugarlabs.org/read/mainline.git" }, { "name": "log", - "out-of-source": false, "repo": "git://git.sugarlabs.org/log/mainline.git" }, { "branch": "gtk3", "name": "terminal", - "out-of-source": false, "repo": "git://git.sugarlabs.org/terminal/mainline.git" }, { "branch": "gtk3", "name": "pippy", - "out-of-source": false, "repo": "git://git.sugarlabs.org/pippy/mainline.git" }, { "branch": "gtk3", "name": "imageviewer", - "out-of-source": false, "repo": "git://git.sugarlabs.org/imageviewer/mainline.git" }, { "name": "jukebox", - "out-of-source": false, "repo": "git://git.sugarlabs.org/jukebox/mainline.git" } ] diff --git a/devbot/build.py b/devbot/build.py index 91397e6..99d9f8d 100644 --- a/devbot/build.py +++ b/devbot/build.py @@ -122,7 +122,8 @@ def _build_autotools(module, log): _unlink_libtool_files() def _build_activity(module, log): - command.run(["./setup.py", "install", "--prefix", config.prefix_dir], log) + setup = os.path.join(module.get_source_dir(), "setup.py") + command.run([setup, "install", "--prefix", config.prefix_dir], log) def _build_module(module, log=None): print "\n=== Building %s ===\n" % module.name -- cgit v0.9.1