diff --git a/Makefile.am b/Makefile.am index 240485e..a0aa67c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = osinfo test tools docs po examples +SUBDIRS = osinfo test tools po examples INTLTOOL_FILES = \ intltool-extract.in \ diff --git a/Makefile.in b/Makefile.in index 915463a..2af13d1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -428,7 +428,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = osinfo test tools docs po examples +SUBDIRS = osinfo test tools po examples INTLTOOL_FILES = \ intltool-extract.in \ intltool-merge.in \ diff --git a/configure b/configure index b17c129..d1916af 100755 --- a/configure +++ b/configure @@ -15549,7 +15549,7 @@ fi GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h tools/Makefile test/Makefile docs/Makefile docs/reference/Makefile examples/Makefile po/Makefile.in" +ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h tools/Makefile test/Makefile examples/Makefile po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16638,8 +16638,6 @@ do "osinfo/osinfo_version.h") CONFIG_FILES="$CONFIG_FILES osinfo/osinfo_version.h" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; - "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; diff --git a/configure.ac b/configure.ac index f002cab..fab8d04 100644 --- a/configure.ac +++ b/configure.ac @@ -285,8 +285,6 @@ AC_CONFIG_FILES([ osinfo/osinfo_version.h tools/Makefile test/Makefile - docs/Makefile - docs/reference/Makefile examples/Makefile po/Makefile.in ]) diff --git a/examples/demo.js b/examples/demo.js index 28cf805..0f668bc 100755 --- a/examples/demo.js +++ b/examples/demo.js @@ -32,7 +32,7 @@ for (idx in osnames) { print (" OS short id " + name) } -var osid = "http://fedoraproject.org/fedora-11" +var osid = "https://wiki.parabola.nu/Get_Parabola" var hvid = "http://qemu.org/qemu-kvm-0.11.0" var drvclass = "net" //var drvclass = "audio" diff --git a/examples/libosinfo-dummy-data.xml b/examples/libosinfo-dummy-data.xml index 65d23b7..8df9f37 100644 --- a/examples/libosinfo-dummy-data.xml +++ b/examples/libosinfo-dummy-data.xml @@ -64,87 +64,11 @@ - - - fedora11 - Fedora 11 - 11 - Fedora Project - apples - marmot - aardvark - - - - - es1391 - - - ac97+ - - - - - - fedora10 - Fedora 10 - 10 - Fedora Project - - - - - ac97 - - - es1391 - - - - - - opensuse11.2 - OpenSuse 11.2 - 11.2 - OpenSuse Project + + parabola + Parabola GNU/Linux-libre + Parabola Project - - - - - - - ac97 - - - ES1370 - - - 3com - - - - - - - - - - - es1370 - - - ac97 - - - es1371 - - - 3com - - - - diff --git b/po/POTFILES.skip b/po/POTFILES.skip new file mode 100644 index 0000000..c867203 --- /dev/null +++ b/po/POTFILES.skip @@ -0,0 +1,8 @@ +data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in diff --git a/test/test-isodetect.c b/test/test-isodetect.c index 64d0e9a..fa3ef27 100644 --- a/test/test-isodetect.c +++ b/test/test-isodetect.c @@ -366,90 +366,6 @@ static void test_one(const gchar *vendor) g_object_unref(loader); } -START_TEST(test_fedora) -{ - test_one("fedora"); -} -END_TEST - -START_TEST(test_rhel) -{ - test_one("rhel"); -} -END_TEST - -START_TEST(test_ubuntu) -{ - test_one("ubuntu"); -} -END_TEST - -START_TEST(test_debian) -{ - test_one("debian"); -} -END_TEST - -START_TEST(test_windows) -{ - test_one("windows"); -} -END_TEST - -START_TEST(test_freebsd) -{ - test_one("freebsd"); -} -END_TEST - -START_TEST(test_openbsd) -{ - test_one("openbsd"); -} -END_TEST - -START_TEST(test_opensuse) -{ - test_one("opensuse"); -} -END_TEST - -START_TEST(test_centos) -{ - test_one("centos"); -} -END_TEST - -START_TEST(test_gnome) -{ - test_one("gnome"); -} -END_TEST - -START_TEST(test_altlinux) -{ - test_one("altlinux"); -} -END_TEST - -START_TEST(test_mageia) -{ - test_one("mageia"); -} -END_TEST - -START_TEST(test_sles) -{ - test_one("sles"); -} -END_TEST - -START_TEST(test_sled) -{ - test_one("sled"); -} -END_TEST - static Suite * list_suite(void) { @@ -457,20 +373,6 @@ list_suite(void) TCase *tc = tcase_create("Core"); tcase_set_timeout(tc, 20); - tcase_add_test(tc, test_fedora); - tcase_add_test(tc, test_rhel); - tcase_add_test(tc, test_ubuntu); - tcase_add_test(tc, test_debian); - tcase_add_test(tc, test_windows); - tcase_add_test(tc, test_freebsd); - tcase_add_test(tc, test_openbsd); - tcase_add_test(tc, test_opensuse); - tcase_add_test(tc, test_centos); - tcase_add_test(tc, test_gnome); - tcase_add_test(tc, test_altlinux); - tcase_add_test(tc, test_mageia); - tcase_add_test(tc, test_sles); - tcase_add_test(tc, test_sled); suite_add_tcase(s, tc); return s; }