[dconf: 111/111] Merge branch 'wip/reorg'

From: Ryan Lortie <ryanl src gnome org>
To: commits-list gnome org
Cc:
Subject: [dconf: 111/111] Merge branch 'wip/reorg'
Date: Fri, 13 Jul 2012 18:14:41 +0000 (UTC)
commit 68a2895ca9896c795aa1644d30ac1ea8f129805b
Merge: bdce5c2 0bd2f8e
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri Jul 13 14:14:04 2012 -0400

    Merge branch 'wip/reorg'
    
    Conflicts:
    	bin/dconf-dump.vala
    	configure.ac
    	editor/Makefile.am

 .gitignore                                         |    6 +
 HACKING                                            |   80 ++
 Makefile.am                                        |   25 +-
 Makefile.gtester                                   |   66 +
 README                                             |   81 ++
 bin/Makefile.am                                    |   23 +-
 bin/dconf-dump.vala                                |   37 +-
 bin/dconf-update.vala                              |    2 +-
 bin/dconf.vala                                     |   28 +-
 bin/gvdb.vapi                                      |    2 +-
 client/.gitignore                                  |    9 +-
 client/Makefile.am                                 |   48 +-
 client/dconf-client.c                              |  570 ++++++++
 client/dconf-client.h                              |   87 +-
 client/dconf-client.vala                           |  380 -----
 client/dconf.deps                                  |    1 +
 client/dconf.h                                     |    1 +
 client/dconf.vapi                                  |   60 +
 client/engine.vapi                                 |   35 -
 client/extra-docs.c                                |   89 --
 common/.gitignore                                  |    3 +
 common/Makefile.am                                 |   17 +-
 common/dconf-changeset.c                           |  562 ++++++++
 common/dconf-changeset.h                           |   64 +
 common/dconf-paths.c                               |   24 +-
 common/dconf-paths.h                               |    2 +-
 configure.ac                                       |   19 +-
 dbus-1/.gitignore                                  |    2 +
 dbus-1/Makefile.am                                 |   31 +-
 dbus-1/dconf-dbus-1.c                              |  633 +--------
 dbus-1/dconf-libdbus-1.c                           |  352 +++++
 dbus-1/dconf-libdbus-1.h                           |   11 +
 docs/Makefile.am                                   |   18 +-
 docs/dconf-docs.xml                                |    5 +-
 docs/dconf-sections.txt                            |   41 +-
 editor/Makefile.am                                 |   37 +-
 editor/dconf-model.vala                            |   26 +-
 engine/.gitignore                                  |    2 +
 engine/Makefile.am                                 |   20 +-
 .../dconf-changeset-list.h                         |   21 +-
 engine/dconf-engine-profile.c                      |  214 +++
 .../dconf-engine-profile.h                         |   12 +-
 .../dconf-engine-source-private.h                  |   18 +-
 engine/dconf-engine-source-system.c                |   82 ++
 engine/dconf-engine-source-user.c                  |   96 ++
 engine/dconf-engine-source.c                       |  116 ++
 engine/dconf-engine-source.h                       |   67 +
 engine/dconf-engine.c                              | 1451 +++++++++++++-------
 engine/dconf-engine.h                              |  194 ++--
 gdbus/.gitignore                                   |    4 +
 gdbus/Makefile.am                                  |   21 +
 gdbus/dconf-gdbus-filter.c                         |  311 +++++
 gdbus/dconf-gdbus-thread.c                         |  357 +++++
 gsettings/Makefile.am                              |   21 +-
 gsettings/abicheck.sh                              |    2 +
 gsettings/dconfcontext.c                           |   33 -
 gsettings/dconfcontext.h                           |    9 -
 gsettings/dconfsettingsbackend.c                   |  633 ++--------
 gvdb/.gitignore                                    |    2 +
 gvdb/Makefile.am                                   |   16 +-
 gvdb/gvdb-builder.c                                |    7 +
 gvdb/gvdb-reader.c                                 |  425 ++++---
 gvdb/gvdb-reader.h                                 |   33 +-
 service/Makefile.am                                |   13 +-
 service/dconf-interfaces.c                         |   21 +-
 service/dconf-rebuilder.c                          |  247 ++--
 service/dconf-state.c                              |   15 -
 service/dconf-state.h                              |    1 -
 service/dconf-writer.c                             |   50 +-
 service/dconf-writer.h                             |    5 +
 service/service.c                                  |   92 +-
 shm/.gitignore                                     |    2 +
 shm/Makefile.am                                    |   11 +
 shm/dconf-shm.c                                    |  151 ++
 common/dconf-shmdir.h => shm/dconf-shm.h           |   18 +-
 tests/.gitignore                                   |   14 +-
 tests/Makefile.am                                  |  109 ++-
 tests/changeset.c                                  |  398 ++++++
 tests/client.c                                     |  179 +++
 tests/dbus.c                                       |  423 ++++++
 tests/dbus1.c                                      |    2 +-
 tests/dconf-mock-dbus.c                            |   52 +
 tests/dconf-mock-gvdb.c                            |  195 +++
 tests/dconf-mock-shm.c                             |  124 ++
 tests/dconf-mock.h                                 |   19 +
 tests/engine.c                                     |  427 ++++++
 tests/gsettings.c                                  |    2 +-
 tests/gvdb.c                                       |  432 ++++++
 tests/gvdbs/empty_gvdb                             |  Bin 0 -> 32 bytes
 tests/gvdbs/example_gvdb                           |  Bin 0 -> 246 bytes
 tests/gvdbs/example_gvdb.big-endian                |  Bin 0 -> 246 bytes
 tests/gvdbs/file_too_small                         |    1 +
 tests/gvdbs/invalid_header                         |    1 +
 tests/gvdbs/nested_gvdb                            |  Bin 0 -> 371 bytes
 tests/paths.c                                      |   32 +-
 tests/profile/broken-profile                       |    2 +
 tests/profile/colourful                            |   13 +
 tests/profile/dos                                  |    2 +
 tests/profile/many-sources                         |   10 +
 tests/profile/no-newline-longline                  |    1 +
 tests/profile/test-profile                         |    1 +
 tests/profile/will-never-exist                     |    1 +
 tests/shm.c                                        |  170 +++
 tests/tmpdir.c                                     |   53 +
 tests/tmpdir.h                                     |    9 +
 trim-lcov.py                                       |   53 +
 106 files changed, 8008 insertions(+), 2987 deletions(-)
---
diff --cc configure.ac
index 7006b37,93680cf..d580d75
--- a/configure.ac
+++ b/configure.ac
@@@ -11,9 -11,15 +11,15 @@@ AC_CONFIG_HEADERS([config.h]
  AM_INIT_AUTOMAKE([1.11 -Wno-portability no-dist-gzip dist-xz])
  AM_SILENT_RULES([yes])
  
+ # Set default CFLAGS before AC_PROG_CC does
+ if test "${CFLAGS+yes}" != "yes"; then
+   CFLAGS='-O2 -g -Wall -Wwrite-strings -Wmissing-prototypes -fno-common'
+ fi
+ 
  # Check for programs
  AC_PROG_CC
 +AM_PROG_VALAC([0.17.0])
+ AC_PROG_RANLIB
 -AM_PROG_VALAC([0.15.1])
  
  # Use GSettings
  GLIB_GSETTINGS
diff --cc editor/Makefile.am
index a030c7d,eb668e7..3fa76f6
--- a/editor/Makefile.am
+++ b/editor/Makefile.am
@@@ -1,10 -1,31 +1,33 @@@
+ include $(top_srcdir)/Makefile.gtester
+ 
+ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/client
+ 
  bin_PROGRAMS = dconf-editor
  
- AM_CFLAGS = $(gtk_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\" -DVERSION=\"$(VERSION)\" -DGETTEXT_PACKAGE=\"dconf-editor\"
- AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg libxml-2.0 --pkg dconf
- CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable
- dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gee_LIBS) $(libxml_LIBS)
- dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
+ dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
+ 
+ dconf_editor_LDADD = \
+ 	../client/libdconf.so.1		\
+ 	$(gtk_LIBS)			\
+ 	$(gee_LIBS)			\
+ 	$(gmodule_LIBS)			\
+ 	$(libxml_LIBS)
+ 
+ dconf_editor_CFLAGS = \
 -	$(gtk_CFLAGS)			\
 -	$(gee_CFLAGS)			\
 -	$(libxml_CFLAGS)		\
 -	-DPKGDATADIR=\"$(pkgdatadir)\"	\
++	$(gtk_CFLAGS)				\
++	$(gee_CFLAGS)				\
++	$(libxml_CFLAGS)			\
++	-DPKGDATADIR=\"$(pkgdatadir)\"		\
++	-DVERSION=\"$(VERSION)\"		\
++	-DGETTEXT_PACKAGE=\"dconf-editor\"	\
+ 	-w
+ 
+ dconf_editor_SOURCES = \
+ 	config.vapi		\
+ 	dconf-editor.vala	\
+ 	dconf-model.vala	\
+ 	dconf-schema.vala	\
+ 	dconf-view.vala
  
  desktopdir = $(datadir)/applications
  desktop_in_files = dconf-editor.desktop.in.in
@@@ -28,7 -49,7 +51,7 @@@ update-icon-cache
  		gtk-update-icon-cache -f -t $(datadir)/icons/hicolor; \
  	fi
  
- uidir = $(datadir)/dconf-editor
- dist_ui_DATA = dconf-editor.ui dconf-editor-menu.ui
+ pkgdatadir = $(datadir)/dconf-editor
 -dist_pkgdata_DATA = dconf-editor.ui
++dist_pkgdata_DATA = dconf-editor.ui dconf-editor-menu.ui
  
  EXTRA_DIST = $(gsettings_SCHEMAS) $(icons)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]