GNOME.org
 

[gnome-software] trivial: Split out flatpak to a new directory

commit d54bf6fafed02fd5250f74149aea9db326760262
Author: Richard Hughes <richard hughsie com>
Date:   Tue Mar 7 16:34:38 2017 +0000

    trivial: Split out flatpak to a new directory

 configure.ac                                       |    1 +
 plugins/Makefile.am                                |   49 +------------
 plugins/flatpak/Makefile.am                        |   39 ++++++++++
 plugins/flatpak/gs-appstream.c                     |    1 +
 plugins/flatpak/gs-appstream.h                     |    1 +
 plugins/{ => flatpak}/gs-flatpak-symlinks.c        |    0
 plugins/{ => flatpak}/gs-flatpak-symlinks.h        |    0
 plugins/{ => flatpak}/gs-flatpak.c                 |    0
 plugins/{ => flatpak}/gs-flatpak.h                 |    0
 plugins/{ => flatpak}/gs-plugin-flatpak.c          |    0
 plugins/{ => flatpak}/gs-self-test.c               |   81 +++-----------------
 ...g.gnome.Software.Plugin.Flatpak.metainfo.xml.in |    0
 .../flatpak => plugins/flatpak/tests}/.gitignore   |    0
 .../tests}/app-missing-runtime/org.test.Chiron     |    0
 .../tests}/app-update/org.test.Chiron/.gitignore   |    0
 .../app-update/org.test.Chiron/files/bin/chiron.sh |    0
 .../icons/flatpak/128x128/org.test.Chiron.png      |  Bin 373 -> 373 bytes
 .../icons/flatpak/64x64/org.test.Chiron.png        |  Bin 168 -> 168 bytes
 .../share/app-info/xmls/org.test.Chiron.xml.gz     |  Bin 434 -> 434 bytes
 .../share/appdata/org.test.Chiron.appdata.xml      |    0
 .../share/applications/org.test.Chiron.desktop     |    0
 .../icons/hicolor/128x128/apps/org.test.Chiron.png |    0
 .../tests}/app-update/org.test.Chiron/metadata     |    0
 .../app-with-runtime/org.test.Chiron/.gitignore    |    0
 .../org.test.Chiron/files/bin/chiron.sh            |    0
 .../share/appdata/org.test.Chiron.appdata.xml      |    0
 .../share/applications/org.test.Chiron.desktop     |    0
 .../icons/hicolor/128x128/apps/org.test.Chiron.png |  Bin 334 -> 334 bytes
 .../app-with-runtime/org.test.Chiron/metadata      |    0
 .../app-with-runtime/org.test.Runtime/files/.empty |    0
 .../app-with-runtime/org.test.Runtime/metadata     |    0
 .../org.test.Runtime/usr/.gitignore                |    0
 .../org.test.Runtime/usr/share/libtest/README      |    0
 .../share/metainfo/org.test.Runtime.metainfo.xml   |    0
 .../flatpak => plugins/flatpak/tests}/build.py     |    0
 .../flatpak/tests}/only-runtime/org.test.Runtime   |    0
 plugins/gs-appstream.c                             |    1 -
 plugins/gs-appstream.h                             |    1 -
 po/POTFILES.in                                     |    2 +-
 39 files changed, 56 insertions(+), 120 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 98dfe19..c472bf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -491,6 +491,7 @@ plugins/epiphany/Makefile
 plugins/external-appstream/Makefile
 plugins/fedora-distro-upgrades/Makefile
 plugins/fedora-tagger-usage/Makefile
+plugins/flatpak/Makefile
 plugins/fwupd/Makefile
 plugins/limba/Makefile
 plugins/modalias/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index f4f1ca5..eca45bd 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -60,55 +60,8 @@ if HAVE_SHELL_EXTENSIONS
 SUBDIRS += shell-extensions
 endif
 
-AM_CPPFLAGS =                                          \
-       -DDATADIR=\"$(datadir)\"                        \
-       -DG_LOG_DOMAIN=\"GsPlugin\"                     \
-       -DLIBEXECDIR=\""$(libexecdir)"\"                \
-       -DLOCALSTATEDIR=\""$(localstatedir)"\"          \
-       -DLOCALEDIR=\""$(localedir)"\"                  \
-       -DTESTDATADIR=\""$(top_srcdir)/data"\"          \
-       -DLOCALPLUGINDIR=\""$(top_builddir)/plugins/.libs"\"    \
-       -DLOCALPLUGINDIR_CORE=\""$(top_builddir)/plugins/core/.libs"\"
-
-plugindir = $(GS_PLUGIN_DIR)
-plugin_LTLIBRARIES =
-
-appdata_in_files =
-
-if HAVE_FLATPAK
-plugin_LTLIBRARIES += libgs_plugin_flatpak.la
-endif
-
 if HAVE_FLATPAK
-appdata_in_files += org.gnome.Software.Plugin.Flatpak.metainfo.xml.in
-libgs_plugin_flatpak_la_SOURCES =                      \
-       gs-appstream.c                                  \
-       gs-appstream.h                                  \
-       gs-flatpak.c                                    \
-       gs-flatpak.h                                    \
-       gs-flatpak-symlinks.c                           \
-       gs-flatpak-symlinks.h                           \
-       gs-plugin-flatpak.c
-libgs_plugin_flatpak_la_LIBADD = $(GS_PLUGIN_LIBS) $(FLATPAK_LIBS)
-libgs_plugin_flatpak_la_LDFLAGS = -module -avoid-version
-libgs_plugin_flatpak_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(FLATPAK_CFLAGS)
-endif
-
-# MetaInfo files
-%.metainfo.xml: %.metainfo.xml.in
-       $(AM_V_GEN) msgfmt --xml -d $(top_srcdir)/po --template $< -o $@
-
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-EXTRA_DIST = $(appdata_in_files)
-CLEANFILES = $(appdata_DATA)
-
-if ENABLE_TESTS
-check_PROGRAMS = gs-self-test
-gs_self_test_SOURCES = gs-self-test.c
-gs_self_test_LDADD = $(GS_PRIVATE_LIBS)
-gs_self_test_CFLAGS = $(GS_PRIVATE_CFLAGS)
-TESTS = gs-self-test
+SUBDIRS += flatpak
 endif
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/flatpak/Makefile.am b/plugins/flatpak/Makefile.am
new file mode 100644
index 0000000..ea98654
--- /dev/null
+++ b/plugins/flatpak/Makefile.am
@@ -0,0 +1,39 @@
+AM_CPPFLAGS =                                          \
+       -DSYSCONFDIR=\""$(sysconfdir)"\"                \
+       -DTESTDATADIR=\""$(srcdir)"\"                   \
+       -DLOCALPLUGINDIR=\""$(builddir)/.libs"\"        \
+       -DLOCALPLUGINDIR_CORE=\""$(top_builddir)/plugins/core/.libs"\"
+
+plugindir = $(GS_PLUGIN_DIR)
+plugin_LTLIBRARIES = libgs_plugin_flatpak.la
+
+libgs_plugin_flatpak_la_SOURCES =                      \
+       gs-appstream.c                                  \
+       gs-appstream.h                                  \
+       gs-flatpak.c                                    \
+       gs-flatpak.h                                    \
+       gs-flatpak-symlinks.c                           \
+       gs-flatpak-symlinks.h                           \
+       gs-plugin-flatpak.c
+libgs_plugin_flatpak_la_LIBADD = $(GS_PLUGIN_LIBS) $(FLATPAK_LIBS)
+libgs_plugin_flatpak_la_LDFLAGS = -module -avoid-version
+libgs_plugin_flatpak_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(FLATPAK_CFLAGS)
+
+%.metainfo.xml: %.metainfo.xml.in
+       $(AM_V_GEN) msgfmt --xml -d $(top_srcdir)/po --template $< -o $@
+
+appdata_in_files = org.gnome.Software.Plugin.Flatpak.metainfo.xml.in
+appdatadir = $(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+EXTRA_DIST = $(appdata_in_files)
+CLEANFILES = $(appdata_DATA)
+
+if ENABLE_TESTS
+check_PROGRAMS = gs-self-test
+gs_self_test_SOURCES = gs-self-test.c
+gs_self_test_LDADD = $(GS_PRIVATE_LIBS)
+gs_self_test_CFLAGS = $(GS_PRIVATE_CFLAGS)
+TESTS = gs-self-test
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/flatpak/gs-appstream.c b/plugins/flatpak/gs-appstream.c
new file mode 120000
index 0000000..96326ab
--- /dev/null
+++ b/plugins/flatpak/gs-appstream.c
@@ -0,0 +1 @@
+../core/gs-appstream.c
\ No newline at end of file
diff --git a/plugins/flatpak/gs-appstream.h b/plugins/flatpak/gs-appstream.h
new file mode 120000
index 0000000..4eabcb3
--- /dev/null
+++ b/plugins/flatpak/gs-appstream.h
@@ -0,0 +1 @@
+../core/gs-appstream.h
\ No newline at end of file
diff --git a/plugins/gs-flatpak-symlinks.c b/plugins/flatpak/gs-flatpak-symlinks.c
similarity index 100%
rename from plugins/gs-flatpak-symlinks.c
rename to plugins/flatpak/gs-flatpak-symlinks.c
diff --git a/plugins/gs-flatpak-symlinks.h b/plugins/flatpak/gs-flatpak-symlinks.h
similarity index 100%
rename from plugins/gs-flatpak-symlinks.h
rename to plugins/flatpak/gs-flatpak-symlinks.h
diff --git a/plugins/gs-flatpak.c b/plugins/flatpak/gs-flatpak.c
similarity index 100%
rename from plugins/gs-flatpak.c
rename to plugins/flatpak/gs-flatpak.c
diff --git a/plugins/gs-flatpak.h b/plugins/flatpak/gs-flatpak.h
similarity index 100%
rename from plugins/gs-flatpak.h
rename to plugins/flatpak/gs-flatpak.h
diff --git a/plugins/gs-plugin-flatpak.c b/plugins/flatpak/gs-plugin-flatpak.c
similarity index 100%
rename from plugins/gs-plugin-flatpak.c
rename to plugins/flatpak/gs-plugin-flatpak.c
diff --git a/plugins/gs-self-test.c b/plugins/flatpak/gs-self-test.c
similarity index 92%
rename from plugins/gs-self-test.c
rename to plugins/flatpak/gs-self-test.c
index 25d80b3..9587701 100644
--- a/plugins/gs-self-test.c
+++ b/plugins/flatpak/gs-self-test.c
@@ -48,7 +48,7 @@ gs_plugin_loader_flatpak_repo_func (GsPluginLoader *plugin_loader)
                return;
 
        /* get a resolvable  */
-       testdir = gs_test_get_filename (TESTDATADIR, "tests/flatpak/app-with-runtime");
+       testdir = gs_test_get_filename (TESTDATADIR, "tests/app-with-runtime");
        if (testdir == NULL)
                return;
        testdir_repourl = g_strdup_printf ("file://%s/repo", testdir);
@@ -177,7 +177,7 @@ gs_plugin_loader_flatpak_app_with_runtime_func (GsPluginLoader *plugin_loader)
                return;
 
        /* no files to use */
-       repodir_fn = gs_test_get_filename (TESTDATADIR, "tests/flatpak/app-with-runtime/repo");
+       repodir_fn = gs_test_get_filename (TESTDATADIR, "tests/app-with-runtime/repo");
        if (repodir_fn == NULL ||
            !g_file_test (repodir_fn, G_FILE_TEST_EXISTS)) {
                g_test_skip ("no flatpak test repo");
@@ -200,7 +200,7 @@ gs_plugin_loader_flatpak_app_with_runtime_func (GsPluginLoader *plugin_loader)
 
        /* add a remote */
        app_source = gs_app_new ("test");
-       testdir = gs_test_get_filename (TESTDATADIR, "tests/flatpak/app-with-runtime");
+       testdir = gs_test_get_filename (TESTDATADIR, "tests/app-with-runtime");
        if (testdir == NULL)
                return;
        testdir_repourl = g_strdup_printf ("file://%s/repo", testdir);
@@ -269,6 +269,7 @@ gs_plugin_loader_flatpak_app_with_runtime_func (GsPluginLoader *plugin_loader)
        g_assert_cmpint (gs_app_get_kind (app), ==, AS_APP_KIND_DESKTOP);
        g_assert_cmpint (gs_app_get_state (app), ==, AS_APP_STATE_AVAILABLE);
        g_assert_cmpint ((gint64) gs_app_get_kudos (app), ==,
+                        GS_APP_KUDO_MY_LANGUAGE |
                         GS_APP_KUDO_HAS_KEYWORDS |
                         GS_APP_KUDO_HI_DPI_ICON |
                         GS_APP_KUDO_SANDBOXED_SECURE |
@@ -428,7 +429,7 @@ gs_plugin_loader_flatpak_app_missing_runtime_func (GsPluginLoader *plugin_loader
                return;
 
        /* no files to use */
-       repodir_fn = gs_test_get_filename (TESTDATADIR, "tests/flatpak/app-missing-runtime/repo");
+       repodir_fn = gs_test_get_filename (TESTDATADIR, "tests/app-missing-runtime/repo");
        if (repodir_fn == NULL ||
            !g_file_test (repodir_fn, G_FILE_TEST_EXISTS)) {
                g_test_skip ("no flatpak test repo");
@@ -437,7 +438,7 @@ gs_plugin_loader_flatpak_app_missing_runtime_func (GsPluginLoader *plugin_loader
 
        /* add a remote */
        app_source = gs_app_new ("test");
-       testdir = gs_test_get_filename (TESTDATADIR, "tests/flatpak/app-missing-runtime");
+       testdir = gs_test_get_filename (TESTDATADIR, "tests/app-missing-runtime");
        if (testdir == NULL)
                return;
        testdir_repourl = g_strdup_printf ("file://%s/repo", testdir);
@@ -575,7 +576,7 @@ gs_plugin_loader_flatpak_runtime_repo_func (GsPluginLoader *plugin_loader)
        gs_plugin_loader_setup_again (plugin_loader);
 
        /* write a flatpakrepo file */
-       testdir = gs_test_get_filename (TESTDATADIR, "tests/flatpak/only-runtime");
+       testdir = gs_test_get_filename (TESTDATADIR, "tests/only-runtime");
        if (testdir == NULL)
                return;
        testdir_repourl = g_strdup_printf ("file://%s/repo", testdir);
@@ -590,7 +591,7 @@ gs_plugin_loader_flatpak_runtime_repo_func (GsPluginLoader *plugin_loader)
 
        /* write a flatpakref file */
        fn_repourl = g_strdup_printf ("file://%s", fn_repo);
-       testdir2 = gs_test_get_filename (TESTDATADIR, "tests/flatpak/app-missing-runtime");
+       testdir2 = gs_test_get_filename (TESTDATADIR, "tests/app-missing-runtime");
        if (testdir2 == NULL)
                return;
        testdir2_repourl = g_strdup_printf ("file://%s/repo", testdir2);
@@ -731,7 +732,7 @@ gs_plugin_loader_flatpak_ref_func (GsPluginLoader *plugin_loader)
 
        /* add a remote with only the runtime in */
        app_source = gs_app_new ("test");
-       testdir = gs_test_get_filename (TESTDATADIR, "tests/flatpak/only-runtime");
+       testdir = gs_test_get_filename (TESTDATADIR, "tests/only-runtime");
        if (testdir == NULL)
                return;
        testdir_repourl = g_strdup_printf ("file://%s/repo", testdir);
@@ -787,7 +788,7 @@ gs_plugin_loader_flatpak_ref_func (GsPluginLoader *plugin_loader)
        g_assert_cmpint (gs_app_get_state (runtime), ==, AS_APP_STATE_INSTALLED);
 
        /* write a flatpakref file */
-       testdir2 = gs_test_get_filename (TESTDATADIR, "tests/flatpak/app-with-runtime");
+       testdir2 = gs_test_get_filename (TESTDATADIR, "tests/app-with-runtime");
        if (testdir2 == NULL)
                return;
        testdir2_repourl = g_strdup_printf ("file://%s/repo", testdir2);
@@ -923,13 +924,13 @@ gs_plugin_loader_flatpak_app_update_func (GsPluginLoader *plugin_loader)
                return;
 
        /* no files to use */
-       repodir1_fn = gs_test_get_filename (TESTDATADIR, "tests/flatpak/app-with-runtime/repo");
+       repodir1_fn = gs_test_get_filename (TESTDATADIR, "tests/app-with-runtime/repo");
        if (repodir1_fn == NULL ||
            !g_file_test (repodir1_fn, G_FILE_TEST_EXISTS)) {
                g_test_skip ("no flatpak test repo");
                return;
        }
-       repodir2_fn = gs_test_get_filename (TESTDATADIR, "tests/flatpak/app-update/repo");
+       repodir2_fn = gs_test_get_filename (TESTDATADIR, "tests/app-update/repo");
        if (repodir2_fn == NULL ||
            !g_file_test (repodir2_fn, G_FILE_TEST_EXISTS)) {
                g_test_skip ("no flatpak test repo");
@@ -1127,30 +1128,13 @@ main (int argc, char **argv)
        g_autoptr(GsPluginLoader) plugin_loader = NULL;
        const gchar *whitelist[] = {
                "appstream",
-               "dummy",
                "flatpak",
-               "generic-updates",
-               "hardcoded-blacklist",
-               "desktop-categories",
-               "desktop-menu-path",
                "icons",
-               "key-colors",
-               "provenance",
-               "provenance-license",
-               "packagekit-local",
-               "repos",
                NULL
        };
 
        g_test_init (&argc, &argv, NULL);
        g_setenv ("G_MESSAGES_DEBUG", "all", TRUE);
-
-       /* set all the things required as a dummy test harness */
-       g_setenv ("GS_SELF_TEST_LOCALE", "en_GB", TRUE);
-       g_setenv ("GS_SELF_TEST_DUMMY_ENABLE", "1", TRUE);
-       g_setenv ("GS_SELF_TEST_PROVENANCE_SOURCES", "london*,boston", TRUE);
-       g_setenv ("GS_SELF_TEST_PROVENANCE_LICENSE_SOURCES", "london*,boston", TRUE);
-       g_setenv ("GS_SELF_TEST_PROVENANCE_LICENSE_URL", "https://www.debian.org/";, TRUE);
        g_setenv ("GS_SELF_TEST_FLATPACK_DATADIR", tmp_root, TRUE);
 
        /* ensure test root does not exist */
@@ -1164,47 +1148,9 @@ main (int argc, char **argv)
        xml = g_strdup ("<?xml version=\"1.0\"?>\n"
                "<components version=\"0.9\">\n"
                "  <component type=\"desktop\">\n"
-               "    <id>chiron.desktop</id>\n"
-               "    <pkgname>chiron</pkgname>\n"
-               "  </component>\n"
-               "  <component type=\"desktop\">\n"
                "    <id>zeus.desktop</id>\n"
                "    <name>Zeus</name>\n"
                "    <summary>A teaching application</summary>\n"
-               "    <pkgname>zeus</pkgname>\n"
-               "    <icon type=\"stock\">drive-harddisk</icon>\n"
-               "    <categories>\n"
-               "      <category>AudioVideo</category>\n"
-               "      <category>Player</category>\n"
-               "    </categories>\n"
-               "    <languages>\n"
-               "      <lang percentage=\"100\">en_GB</lang>\n"
-               "    </languages>\n"
-               "  </component>\n"
-               "  <component type=\"desktop\">\n"
-               "    <id>mate-spell.desktop</id>\n"
-               "    <name>Spell</name>\n"
-               "    <summary>A spelling application for MATE</summary>\n"
-               "    <pkgname>mate-spell</pkgname>\n"
-               "    <icon type=\"stock\">drive-harddisk</icon>\n"
-               "    <project_group>MATE</project_group>\n"
-               "  </component>\n"
-               "  <component type=\"addon\">\n"
-               "    <id>zeus-spell.addon</id>\n"
-               "    <extends>zeus.desktop</extends>\n"
-               "    <name>Spell Check</name>\n"
-               "    <summary>Check the spelling when teaching</summary>\n"
-               "    <pkgname>zeus-spell</pkgname>\n"
-               "  </component>\n"
-               "  <component type=\"desktop\">\n"
-               "    <id>Uninstall Zeus.desktop</id>\n"
-               "    <name>Uninstall Zeus</name>\n"
-               "    <summary>Uninstall the teaching application</summary>\n"
-               "    <icon type=\"stock\">drive-harddisk</icon>\n"
-               "  </component>\n"
-               "  <component type=\"os-upgrade\">\n"
-               "    <id>org.fedoraproject.release-rawhide.upgrade</id>\n"
-               "    <summary>Release specific tagline</summary>\n"
                "  </component>\n"
                "</components>\n");
        g_setenv ("GS_SELF_TEST_APPSTREAM_XML", xml, TRUE);
@@ -1226,9 +1172,6 @@ main (int argc, char **argv)
                                      &error);
        g_assert_no_error (error);
        g_assert (ret);
-       g_assert (!gs_plugin_loader_get_enabled (plugin_loader, "notgoingtoexist"));
-       g_assert (!gs_plugin_loader_get_enabled (plugin_loader, "packagekit"));
-       g_assert (gs_plugin_loader_get_enabled (plugin_loader, "appstream"));
 
        /* plugin tests go here */
        g_test_add_data_func ("/gnome-software/plugin-loader{flatpak-app-with-runtime}",
diff --git a/plugins/org.gnome.Software.Plugin.Flatpak.metainfo.xml.in 
b/plugins/flatpak/org.gnome.Software.Plugin.Flatpak.metainfo.xml.in
similarity index 100%
rename from plugins/org.gnome.Software.Plugin.Flatpak.metainfo.xml.in
rename to plugins/flatpak/org.gnome.Software.Plugin.Flatpak.metainfo.xml.in
diff --git a/data/tests/flatpak/.gitignore b/plugins/flatpak/tests/.gitignore
similarity index 100%
rename from data/tests/flatpak/.gitignore
rename to plugins/flatpak/tests/.gitignore
diff --git a/data/tests/flatpak/app-missing-runtime/org.test.Chiron 
b/plugins/flatpak/tests/app-missing-runtime/org.test.Chiron
similarity index 100%
rename from data/tests/flatpak/app-missing-runtime/org.test.Chiron
rename to plugins/flatpak/tests/app-missing-runtime/org.test.Chiron
diff --git a/data/tests/flatpak/app-update/org.test.Chiron/.gitignore 
b/plugins/flatpak/tests/app-update/org.test.Chiron/.gitignore
similarity index 100%
rename from data/tests/flatpak/app-update/org.test.Chiron/.gitignore
rename to plugins/flatpak/tests/app-update/org.test.Chiron/.gitignore
diff --git a/data/tests/flatpak/app-update/org.test.Chiron/files/bin/chiron.sh 
b/plugins/flatpak/tests/app-update/org.test.Chiron/files/bin/chiron.sh
similarity index 100%
rename from data/tests/flatpak/app-update/org.test.Chiron/files/bin/chiron.sh
rename to plugins/flatpak/tests/app-update/org.test.Chiron/files/bin/chiron.sh
diff --git a/data/tests/flatpak/app-update/org.test.Chiron/files/share/appdata/org.test.Chiron.appdata.xml 
b/plugins/flatpak/tests/app-update/org.test.Chiron/files/share/appdata/org.test.Chiron.appdata.xml
similarity index 100%
rename from data/tests/flatpak/app-update/org.test.Chiron/files/share/appdata/org.test.Chiron.appdata.xml
rename to plugins/flatpak/tests/app-update/org.test.Chiron/files/share/appdata/org.test.Chiron.appdata.xml
diff --git a/data/tests/flatpak/app-update/org.test.Chiron/files/share/applications/org.test.Chiron.desktop 
b/plugins/flatpak/tests/app-update/org.test.Chiron/files/share/applications/org.test.Chiron.desktop
similarity index 100%
rename from data/tests/flatpak/app-update/org.test.Chiron/files/share/applications/org.test.Chiron.desktop
rename to plugins/flatpak/tests/app-update/org.test.Chiron/files/share/applications/org.test.Chiron.desktop
diff --git 
a/data/tests/flatpak/app-update/org.test.Chiron/files/share/icons/hicolor/128x128/apps/org.test.Chiron.png 
b/plugins/flatpak/tests/app-update/org.test.Chiron/files/share/icons/hicolor/128x128/apps/org.test.Chiron.png
similarity index 100%
rename from 
data/tests/flatpak/app-update/org.test.Chiron/files/share/icons/hicolor/128x128/apps/org.test.Chiron.png
rename to 
plugins/flatpak/tests/app-update/org.test.Chiron/files/share/icons/hicolor/128x128/apps/org.test.Chiron.png
diff --git a/data/tests/flatpak/app-update/org.test.Chiron/metadata 
b/plugins/flatpak/tests/app-update/org.test.Chiron/metadata
similarity index 100%
rename from data/tests/flatpak/app-update/org.test.Chiron/metadata
rename to plugins/flatpak/tests/app-update/org.test.Chiron/metadata
diff --git a/data/tests/flatpak/app-with-runtime/org.test.Chiron/.gitignore 
b/plugins/flatpak/tests/app-with-runtime/org.test.Chiron/.gitignore
similarity index 100%
rename from data/tests/flatpak/app-with-runtime/org.test.Chiron/.gitignore
rename to plugins/flatpak/tests/app-with-runtime/org.test.Chiron/.gitignore
diff --git a/data/tests/flatpak/app-with-runtime/org.test.Chiron/files/bin/chiron.sh 
b/plugins/flatpak/tests/app-with-runtime/org.test.Chiron/files/bin/chiron.sh
similarity index 100%
rename from data/tests/flatpak/app-with-runtime/org.test.Chiron/files/bin/chiron.sh
rename to plugins/flatpak/tests/app-with-runtime/org.test.Chiron/files/bin/chiron.sh
diff --git 
a/data/tests/flatpak/app-with-runtime/org.test.Chiron/files/share/appdata/org.test.Chiron.appdata.xml 
b/plugins/flatpak/tests/app-with-runtime/org.test.Chiron/files/share/appdata/org.test.Chiron.appdata.xml
similarity index 100%
rename from 
data/tests/flatpak/app-with-runtime/org.test.Chiron/files/share/appdata/org.test.Chiron.appdata.xml
rename to 
plugins/flatpak/tests/app-with-runtime/org.test.Chiron/files/share/appdata/org.test.Chiron.appdata.xml
diff --git 
a/data/tests/flatpak/app-with-runtime/org.test.Chiron/files/share/applications/org.test.Chiron.desktop 
b/plugins/flatpak/tests/app-with-runtime/org.test.Chiron/files/share/applications/org.test.Chiron.desktop
similarity index 100%
rename from 
data/tests/flatpak/app-with-runtime/org.test.Chiron/files/share/applications/org.test.Chiron.desktop
rename to 
plugins/flatpak/tests/app-with-runtime/org.test.Chiron/files/share/applications/org.test.Chiron.desktop
diff --git a/data/tests/flatpak/app-with-runtime/org.test.Chiron/metadata 
b/plugins/flatpak/tests/app-with-runtime/org.test.Chiron/metadata
similarity index 100%
rename from data/tests/flatpak/app-with-runtime/org.test.Chiron/metadata
rename to plugins/flatpak/tests/app-with-runtime/org.test.Chiron/metadata
diff --git a/data/tests/flatpak/app-with-runtime/org.test.Runtime/files/.empty 
b/plugins/flatpak/tests/app-with-runtime/org.test.Runtime/files/.empty
similarity index 100%
rename from data/tests/flatpak/app-with-runtime/org.test.Runtime/files/.empty
rename to plugins/flatpak/tests/app-with-runtime/org.test.Runtime/files/.empty
diff --git a/data/tests/flatpak/app-with-runtime/org.test.Runtime/metadata 
b/plugins/flatpak/tests/app-with-runtime/org.test.Runtime/metadata
similarity index 100%
rename from data/tests/flatpak/app-with-runtime/org.test.Runtime/metadata
rename to plugins/flatpak/tests/app-with-runtime/org.test.Runtime/metadata
diff --git a/data/tests/flatpak/app-with-runtime/org.test.Runtime/usr/.gitignore 
b/plugins/flatpak/tests/app-with-runtime/org.test.Runtime/usr/.gitignore
similarity index 100%
rename from data/tests/flatpak/app-with-runtime/org.test.Runtime/usr/.gitignore
rename to plugins/flatpak/tests/app-with-runtime/org.test.Runtime/usr/.gitignore
diff --git a/data/tests/flatpak/app-with-runtime/org.test.Runtime/usr/share/libtest/README 
b/plugins/flatpak/tests/app-with-runtime/org.test.Runtime/usr/share/libtest/README
similarity index 100%
rename from data/tests/flatpak/app-with-runtime/org.test.Runtime/usr/share/libtest/README
rename to plugins/flatpak/tests/app-with-runtime/org.test.Runtime/usr/share/libtest/README
diff --git 
a/data/tests/flatpak/app-with-runtime/org.test.Runtime/usr/share/metainfo/org.test.Runtime.metainfo.xml 
b/plugins/flatpak/tests/app-with-runtime/org.test.Runtime/usr/share/metainfo/org.test.Runtime.metainfo.xml
similarity index 100%
rename from 
data/tests/flatpak/app-with-runtime/org.test.Runtime/usr/share/metainfo/org.test.Runtime.metainfo.xml
rename to 
plugins/flatpak/tests/app-with-runtime/org.test.Runtime/usr/share/metainfo/org.test.Runtime.metainfo.xml
diff --git a/data/tests/flatpak/build.py b/plugins/flatpak/tests/build.py
similarity index 100%
rename from data/tests/flatpak/build.py
rename to plugins/flatpak/tests/build.py
diff --git a/data/tests/flatpak/only-runtime/org.test.Runtime 
b/plugins/flatpak/tests/only-runtime/org.test.Runtime
similarity index 100%
rename from data/tests/flatpak/only-runtime/org.test.Runtime
rename to plugins/flatpak/tests/only-runtime/org.test.Runtime
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e838ff4..a18019f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -70,7 +70,7 @@ plugins/external-appstream/gs-install-appstream.c
 plugins/fedora-distro-upgrades/gs-plugin-fedora-distro-upgrades.c
 plugins/core/gs-plugin-generic-updates.c
 plugins/epiphany/org.gnome.Software.Plugin.Epiphany.metainfo.xml.in
-plugins/org.gnome.Software.Plugin.Flatpak.metainfo.xml.in
+plugins/flatpak/org.gnome.Software.Plugin.Flatpak.metainfo.xml.in
 plugins/fwupd/org.gnome.Software.Plugin.Fwupd.metainfo.xml.in
 plugins/limba/org.gnome.Software.Plugin.Limba.metainfo.xml.in
 plugins/odrs/org.gnome.Software.Plugin.Odrs.metainfo.xml.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]