diff options
| -rw-r--r-- | scripts/jhbuildrc | 8 | ||||
| -rw-r--r-- | scripts/modules/sugar.modules (renamed from scripts/sugar.modules) | 0 | ||||
| -rw-r--r-- | scripts/modules/system.modules (renamed from scripts/system.modules) | 0 |
3 files changed, 6 insertions, 2 deletions
diff --git a/scripts/jhbuildrc b/scripts/jhbuildrc index a8e026e..ec17a28 100644 --- a/scripts/jhbuildrc +++ b/scripts/jhbuildrc @@ -7,6 +7,10 @@ if os.path.exists("/usr/lib/girepository-1.0"): def root(): return os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +def moduleset_path(moduleset): + return os.path.join(root(), "scripts", "modules", + "%s.modules" % moduleset) + def libdir(system=False): if system: base = "/usr" @@ -21,8 +25,8 @@ def libdir(system=False): interact = not "SUGAR_BUILDBOT" in os.environ use_local_modulesets = True -moduleset = [os.path.join(root(), "scripts", "system.modules"), - os.path.join(root(), "scripts", "sugar.modules")] +moduleset = [moduleset_path("system"), + moduleset_path("sugar")] modules = ["meta-system", "meta-sugar"] checkoutroot = os.path.join(root(), "source") diff --git a/scripts/sugar.modules b/scripts/modules/sugar.modules index b9c4ac8..b9c4ac8 100644 --- a/scripts/sugar.modules +++ b/scripts/modules/sugar.modules diff --git a/scripts/system.modules b/scripts/modules/system.modules index f6f8cf4..f6f8cf4 100644 --- a/scripts/system.modules +++ b/scripts/modules/system.modules |