[glib/shorten-gdbus-test-filename] wip

[Christoph Reiter <creiter src gnome org>]

commit 3658ceabf2f5990f58232da50f0bcac6a39b338f
Author: Christoph Reiter <creiter src gnome org>
Date:   Thu Oct 4 09:09:51 2018 +0200

    wip

 gio/.gitignore                                     |  6 +-
 gio/tests/gdbus-example-objectmanager-client.c     |  2 +-
 gio/tests/gdbus-example-objectmanager-server.c     |  2 +-
 gio/tests/gdbus-object-manager-example/Makefile.am | 22 +++---
 .../gdbus-example-objectmanager.xml                | 78 ----------------------
 gio/tests/gdbus-object-manager-example/meson.build | 16 ++---
 gio/tests/gdbus-peer.c                             |  2 +-
 gio/tests/gdbus-test-fixture.c                     |  2 +-
 8 files changed, 26 insertions(+), 104 deletions(-)
---
diff --git a/gio/.gitignore b/gio/.gitignore
index 235f0398d..02252b83a 100644
--- a/gio/.gitignore
+++ b/gio/.gitignore
@@ -1,9 +1,9 @@
 gapplication
 gconstructor_as_data.h
 gdbus
-gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml
-gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml
-gdbus-example-objectmanager-generated.[ch]
+gdbus-example-objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml
+gdbus-example-objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Cat.xml
+gdbus-example-objectmanager-gen.[ch]
 gdbus-daemon-generated.[ch]
 gio
 gio_probes.h
diff --git a/gio/tests/gdbus-example-objectmanager-client.c b/gio/tests/gdbus-example-objectmanager-client.c
index b235ca140..fcaee0db2 100644
--- a/gio/tests/gdbus-example-objectmanager-client.c
+++ b/gio/tests/gdbus-example-objectmanager-client.c
@@ -1,5 +1,5 @@
 
-#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
+#include "gdbus-object-manager-example/gdbus-example-objectmanager-gen.h"
 
 /* ---------------------------------------------------------------------------------------------------- */
 
diff --git a/gio/tests/gdbus-example-objectmanager-server.c b/gio/tests/gdbus-example-objectmanager-server.c
index 2a7bf63b6..4e2aa1020 100644
--- a/gio/tests/gdbus-example-objectmanager-server.c
+++ b/gio/tests/gdbus-example-objectmanager-server.c
@@ -1,5 +1,5 @@
 
-#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
+#include "gdbus-object-manager-example/gdbus-example-objectmanager-gen.h"
 
 /* ---------------------------------------------------------------------------------------------------- */
 
diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am 
b/gio/tests/gdbus-object-manager-example/Makefile.am
index 1d0464c5c..9c7fb97ec 100644
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
@@ -5,21 +5,21 @@ AM_CPPFLAGS = -g $(gio_INCLUDES) $(GLIB_DEBUG_FLAGS) -I$(top_builddir)/gio -I$(t
 # ------------------------------------------------------------------------
 
 GDBUS_GENERATED = \
-       gdbus-example-objectmanager-generated.h                                                 \
-       gdbus-example-objectmanager-generated.c                                                 \
-       gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml    \
-       gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml       \
+       gdbus-example-objectmanager-gen.h                                                       \
+       gdbus-example-objectmanager-gen.c                                                       \
+       gdbus-example-objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml    \
+       gdbus-example-objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Cat.xml     \
        $(NULL)
 
-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile 
$(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+$(GDBUS_GENERATED) : example.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
        $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
                UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
                $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
                --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
                --c-namespace Example \
                --c-generate-object-manager \
-               --generate-c-code gdbus-example-objectmanager-generated \
-               --generate-docbook gdbus-example-objectmanager-generated \
+               --generate-c-code gdbus-example-objectmanager-gen \
+               --generate-docbook gdbus-example-objectmanager-gen \
                $< \
                $(NULL)
 
@@ -32,8 +32,8 @@ noinst_LTLIBRARIES += libgdbus-example-objectmanager.la
 endif
 
 nodist_libgdbus_example_objectmanager_la_SOURCES = \
-       gdbus-example-objectmanager-generated.h         \
-       gdbus-example-objectmanager-generated.c
+       gdbus-example-objectmanager-gen.h               \
+       gdbus-example-objectmanager-gen.c
 
 libgdbus_example_objectmanager_la_LIBADD = \
        $(top_builddir)/glib/libglib-2.0.la             \
@@ -42,8 +42,8 @@ libgdbus_example_objectmanager_la_LIBADD = \
        $(top_builddir)/gio/libgio-2.0.la               \
        $(NULL)
 
-EXTRA_DIST += gdbus-example-objectmanager.xml
+EXTRA_DIST += example.xml
 
 CLEANFILES += $(GDBUS_GENERATED)
 
-check-TESTS:
\ No newline at end of file
+check-TESTS:
diff --git a/gio/tests/gdbus-object-manager-example/meson.build 
b/gio/tests/gdbus-object-manager-example/meson.build
index 6b27576e8..3331b1d9b 100644
--- a/gio/tests/gdbus-object-manager-example/meson.build
+++ b/gio/tests/gdbus-object-manager-example/meson.build
@@ -1,17 +1,17 @@
 # FIXME: set UNINSTALLED_GLIB_{SRC|BUILD}DIR=top_{src|build}dir ?
-gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanager-generated',
-  input  : ['gdbus-example-objectmanager.xml'],
-  output : ['gdbus-example-objectmanager-generated.h',
-            'gdbus-example-objectmanager-generated.c',
-            'gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml',
-            'gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml'],
+gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanager-gen',
+  input  : ['example.xml'],
+  output : ['gdbus-example-objectmanager-gen.h',
+            'gdbus-example-objectmanager-gen.c',
+            'gdbus-example-objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml',
+            'gdbus-example-objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Cat.xml'],
   command : [python, gdbus_codegen,
              '--interface-prefix', 'org.gtk.GDBus.Example.ObjectManager.',
              '--c-namespace', 'Example',
              '--c-generate-object-manager',
              '--output-directory', '@OUTDIR@',
-             '--generate-c-code', 'gdbus-example-objectmanager-generated',
-             '--generate-docbook', 'gdbus-example-objectmanager-generated',
+             '--generate-c-code', 'gdbus-example-objectmanager-gen',
+             '--generate-docbook', 'gdbus-example-objectmanager-gen',
              '@INPUT@'])
 
 libgdbus_example_objectmanager = library('gdbus-example-objectmanager',
diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c
index 7f35baae6..9f5ce148c 100644
--- a/gio/tests/gdbus-peer.c
+++ b/gio/tests/gdbus-peer.c
@@ -45,7 +45,7 @@
 
 #include "gdbus-tests.h"
 
-#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
+#include "gdbus-object-manager-example/gdbus-example-objectmanager-gen.h"
 
 #ifdef G_OS_UNIX
 static gboolean is_unix = TRUE;
diff --git a/gio/tests/gdbus-test-fixture.c b/gio/tests/gdbus-test-fixture.c
index 1e0a3223c..45907b6a4 100644
--- a/gio/tests/gdbus-test-fixture.c
+++ b/gio/tests/gdbus-test-fixture.c
@@ -1,5 +1,5 @@
 
-#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
+#include "gdbus-object-manager-example/gdbus-example-objectmanager-gen.h"
 
 /* ---------------------------------------------------------------------------------------------------- */