luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'shorten-gdbus-test-filename' into 'master'

Browse Source 
build: work around meson issue with too long filenames on Windows. Fixes #1556

Closes #1556

See merge request GNOME/glib!370
This commit is contained in:
Philip Withnall 2018-10-23 09:16:58 +00:00
commit 7db63898c1
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/.gitignore vendored
View File

@ -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]
objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml
objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Cat.xml
objectmanager-gen.[ch]
gdbus-daemon-generated.[ch]
gio
gio_probes.h

2
gio/tests/gdbus-example-objectmanager-client.c
View File

@ -1,5 +1,5 @@
#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
#include "gdbus-object-manager-example/objectmanager-gen.h"
/* ---------------------------------------------------------------------------------------------------- */

2
gio/tests/gdbus-example-objectmanager-server.c
View File

@ -1,5 +1,5 @@
#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
#include "gdbus-object-manager-example/objectmanager-gen.h"
/* ---------------------------------------------------------------------------------------------------- */

16
gio/tests/gdbus-object-manager-example/Makefile.am
View File

@ -5,10 +5,10 @@ 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 \
objectmanager-gen.h \
objectmanager-gen.c \
objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml \
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
@ -18,8 +18,8 @@ $(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gi
--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 objectmanager-gen \
--generate-docbook 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
objectmanager-gen.h \
objectmanager-gen.c
libgdbus_example_objectmanager_la_LIBADD = \
$(top_builddir)/glib/libglib-2.0.la \

14
gio/tests/gdbus-object-manager-example/meson.build
View File

@ -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',
gdbus_example_objectmanager_generated = custom_target('objectmanager-gen',
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'],
output : ['objectmanager-gen.h',
'objectmanager-gen.c',
'objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml',
'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', 'objectmanager-gen',
'--generate-docbook', 'objectmanager-gen',
'@INPUT@'])
libgdbus_example_objectmanager = library('gdbus-example-objectmanager',

2
gio/tests/gdbus-peer.c
View File

@ -45,7 +45,7 @@
#include "gdbus-tests.h"
#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
#include "gdbus-object-manager-example/objectmanager-gen.h"
#ifdef G_OS_UNIX
static gboolean is_unix = TRUE;

2
gio/tests/gdbus-test-fixture.c
View File

@ -1,5 +1,5 @@
#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
#include "gdbus-object-manager-example/objectmanager-gen.h"
/* ---------------------------------------------------------------------------------------------------- */