diff options
| -rwxr-xr-x | scripts/check-system | 7 | ||||
| -rwxr-xr-x | scripts/deps/activities-runtime.json | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/deps/packages.json | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/deps/prerequisites.json | 0 | ||||
| -rwxr-xr-x | scripts/deps/sugar-build-buildtime.json | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/deps/sugar-build.json (renamed from scripts/deps/sugar-build-runtime.json) | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/deps/sugar-buildtime.json | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/deps/sugar-runtime.json | 12 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/deps/system.json (renamed from scripts/deps/system-buildtime.json) | 0 |
9 files changed, 18 insertions, 21 deletions
diff --git a/scripts/check-system b/scripts/check-system index 3f5e8dd..f1f6622 100755 --- a/scripts/check-system +++ b/scripts/check-system @@ -194,13 +194,10 @@ if not run_checks(distro, checks, packages): xvfb_proc, orig_display = start_xvfb() checks = [] -checks.extend(load_deps_json("system-buildtime")) -checks.extend(load_deps_json("system-buildtime")) +checks.extend(load_deps_json("system")) +checks.extend(load_deps_json("sugar-build")) checks.extend(load_deps_json("sugar-buildtime")) -checks.extend(load_deps_json("sugar-build-buildtime")) -checks.extend(load_deps_json("sugar-build-runtime")) checks.extend(load_deps_json("sugar-runtime")) -checks.extend(load_deps_json("activities-runtime")) run_checks(distro, checks, packages) warn_if_unsupported(distro) diff --git a/scripts/deps/activities-runtime.json b/scripts/deps/activities-runtime.json deleted file mode 100755 index e5be377..0000000 --- a/scripts/deps/activities-runtime.json +++ /dev/null @@ -1,10 +0,0 @@ -[{ "check": "from gi.repository import WebKit", - "checker": "python" }, - { "check": "import pygst", - "checker": "python" }, - { "check": "from gi.repository import Vte", - "checker": "python" }, - { "check": "video4linux2", - "checker": "gstreamer" }, - { "check": "import abiword", - "checker": "python" }] diff --git a/scripts/deps/packages.json b/scripts/deps/packages.json index 6168174..6168174 100755..100644 --- a/scripts/deps/packages.json +++ b/scripts/deps/packages.json diff --git a/scripts/deps/prerequisites.json b/scripts/deps/prerequisites.json index 63d18f5..63d18f5 100755..100644 --- a/scripts/deps/prerequisites.json +++ b/scripts/deps/prerequisites.json diff --git a/scripts/deps/sugar-build-buildtime.json b/scripts/deps/sugar-build-buildtime.json deleted file mode 100755 index 8bcf90c..0000000 --- a/scripts/deps/sugar-build-buildtime.json +++ /dev/null @@ -1,4 +0,0 @@ -[{ "check": "xrandr", - "checker": "pkgconfig" }, - { "check": "x11", - "checker": "pkgconfig" }] diff --git a/scripts/deps/sugar-build-runtime.json b/scripts/deps/sugar-build.json index 503bf57..da6f995 100755..100644 --- a/scripts/deps/sugar-build-runtime.json +++ b/scripts/deps/sugar-build.json @@ -5,4 +5,8 @@ { "check": "dbus-launch", "checker": "binary" }, { "check": "import pyatspi", - "checker": "python" }] + "checker": "python" }, + { "check": "xrandr", + "checker": "pkgconfig" }, + { "check": "x11", + "checker": "pkgconfig" }] diff --git a/scripts/deps/sugar-buildtime.json b/scripts/deps/sugar-buildtime.json index 996def3..996def3 100755..100644 --- a/scripts/deps/sugar-buildtime.json +++ b/scripts/deps/sugar-buildtime.json diff --git a/scripts/deps/sugar-runtime.json b/scripts/deps/sugar-runtime.json index 85f41c5..6f06a59 100755..100644 --- a/scripts/deps/sugar-runtime.json +++ b/scripts/deps/sugar-runtime.json @@ -45,4 +45,14 @@ { "check": "org.freedesktop.Telepathy.ConnectionManager.gabble", "checker": "dbus" }, { "check": "org.freedesktop.Telepathy.ConnectionManager.salut", - "checker": "dbus" }] + "checker": "dbus" }, + { "check": "from gi.repository import WebKit", + "checker": "python" }, + { "check": "import pygst", + "checker": "python" }, + { "check": "from gi.repository import Vte", + "checker": "python" }, + { "check": "video4linux2", + "checker": "gstreamer" }, + { "check": "import abiword", + "checker": "python" }] diff --git a/scripts/deps/system-buildtime.json b/scripts/deps/system.json index ea9e0ff..ea9e0ff 100755..100644 --- a/scripts/deps/system-buildtime.json +++ b/scripts/deps/system.json |