[clutter: 19/19] Merge branch 'wip/meson' into 'master'
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter: 19/19] Merge branch 'wip/meson' into 'master'
- Date: Sun, 17 Jun 2018 20:00:30 +0000 (UTC)
commit ad0bc0b2b0dd110a3098469382c5c5e0e5f037e1
Merge: ef41a8bc9 7943a099f
Author: Emmanuele Bassi <ebassi gmail com>
Date: Sun Jun 17 20:00:07 2018 +0000
Merge branch 'wip/meson' into 'master'
Add Meson build
See merge request GNOME/clutter!2
.gitignore | 12 +-
.gitlab-ci.yml | 20 +
.gitlab-ci/Dockerfile | 69 +
.gitlab-ci/run-docker.sh | 11 +
.gitlab-ci/test-docker.sh | 27 +
Makefile.am | 40 +-
README.in | 1323 --------------------
README.md | 98 +-
{build => build-aux}/Makefile.am | 0
{build => build-aux}/autotools/.gitignore | 0
{build => build-aux}/autotools/Makefile.am | 0
.../autotools/Makefile.am.changelog | 2 +-
{build => build-aux}/autotools/Makefile.am.enums | 0
.../autotools/Makefile.am.gitignore | 0
{build => build-aux}/autotools/Makefile.am.marshal | 0
{build => build-aux}/autotools/Makefile.am.release | 6 +-
{build => build-aux}/autotools/Makefile.am.silent | 0
{build => build-aux}/autotools/as-compiler-flag.m4 | 0
{build => build-aux}/autotools/as-linguas.m4 | 0
{build => build-aux}/autotools/glib-tap.mk | 4 +-
{build => build-aux}/autotools/glibtests.m4 | 0
{build => build-aux}/autotools/introspection.m4 | 0
{build => build-aux}/autotools/tap-driver.sh | 0
{build => build-aux}/autotools/tap-test | 0
{build => build-aux}/clutter-build-setup.sh | 0
{build => build-aux}/clutter-uncrustify.cfg | 0
{build => build-aux}/clutter.modules | 0
{build => build-aux}/gen-changelog.pl | 0
{build => build-aux}/jhbuildrc-clutter | 2 +-
{build => build-aux}/jhbuildrc-custom-example | 0
{build => build-aux}/mingw/Makefile.am | 0
{build => build-aux}/mingw/README | 0
.../mingw/mingw-fetch-dependencies.sh | 0
{build => build-aux}/win32/.gitignore | 0
{build => build-aux}/win32/Makefile.am | 0
{build => build-aux}/win32/vs10/Makefile.am | 0
{build => build-aux}/win32/vs10/README.txt | 9 +-
.../win32/vs10/cally-atkcomponent-example.vcxproj | 0
.../cally-atkcomponent-example.vcxproj.filters | 0
.../vs10/cally-atkeditabletext-example.vcxproj | 0
.../cally-atkeditabletext-example.vcxproj.filters | 0
.../win32/vs10/cally-atkevents-example.vcxproj | 0
.../vs10/cally-atkevents-example.vcxproj.filters | 0
.../win32/vs10/cally-atktext-example.vcxproj | 0
.../vs10/cally-atktext-example.vcxproj.filters | 0
.../win32/vs10/cally-clone-example.vcxproj | 0
.../win32/vs10/cally-clone-example.vcxproj.filters | 0
.../win32/vs10/clutter-build-defines.props | 0
.../win32/vs10/clutter-gen-srcs.props | 0
.../win32/vs10/clutter-install.props | 0
.../win32/vs10/clutter-install.vcxproj | 0
.../win32/vs10/clutter-version-paths.props | 0
{build => build-aux}/win32/vs10/clutter.sln | 0
.../win32/vs10/clutter.vcxproj.filtersin | 0
{build => build-aux}/win32/vs10/clutter.vcxprojin | 0
.../win32/vs10/test-cogl-perf.vcxproj | 0
.../win32/vs10/test-cogl-perf.vcxproj.filters | 0
.../test-interactive-clutter.vcxproj.filtersin | 0
.../win32/vs10/test-interactive-clutter.vcxprojin | 0
.../win32/vs10/test-picking-performance.vcxproj | 0
.../vs10/test-picking-performance.vcxproj.filters | 0
.../win32/vs10/test-picking.vcxproj | 0
.../win32/vs10/test-picking.vcxproj.filters | 0
.../win32/vs10/test-random-text.vcxproj | 0
.../win32/vs10/test-random-text.vcxproj.filters | 0
.../vs10/test-state-hidden-performance.vcxproj | 0
.../test-state-hidden-performance.vcxproj.filters | 0
.../test-state-interactive-performance.vcxproj | 0
...t-state-interactive-performance.vcxproj.filters | 0
.../win32/vs10/test-state-mini-performance.vcxproj | 0
.../test-state-mini-performance.vcxproj.filters | 0
.../win32/vs10/test-state-performance.vcxproj | 0
.../vs10/test-state-performance.vcxproj.filters | 0
.../win32/vs10/test-state-pick-performance.vcxproj | 0
.../test-state-pick-performance.vcxproj.filters | 0
.../win32/vs10/test-text-perf-performance.vcxproj | 0
.../test-text-perf-performance.vcxproj.filters | 0
.../win32/vs10/test-text-perf.vcxproj | 0
.../win32/vs10/test-text-perf.vcxproj.filters | 0
{build => build-aux}/win32/vs10/test-text.vcxproj | 0
.../win32/vs10/test-text.vcxproj.filters | 0
{build => build-aux}/win32/vs9/Makefile.am | 0
{build => build-aux}/win32/vs9/README.txt | 9 +-
.../win32/vs9/cally-atkcomponent-example.vcproj | 0
.../win32/vs9/cally-atkeditabletext-example.vcproj | 0
.../win32/vs9/cally-atkevents-example.vcproj | 0
.../win32/vs9/cally-atktext-example.vcproj | 0
.../win32/vs9/cally-clone-example.vcproj | 0
.../win32/vs9/clutter-build-defines.vsprops | 0
.../win32/vs9/clutter-gen-srcs.vsprops | 0
.../win32/vs9/clutter-install.vcproj | 0
.../win32/vs9/clutter-install.vsprops | 0
.../win32/vs9/clutter-version-paths.vsprops | 0
{build => build-aux}/win32/vs9/clutter.sln | 0
{build => build-aux}/win32/vs9/clutter.vcprojin | 0
.../win32/vs9/test-cogl-perf.vcproj | 0
.../win32/vs9/test-interactive-clutter.vcprojin | 0
.../win32/vs9/test-picking-performance.vcproj | 0
{build => build-aux}/win32/vs9/test-picking.vcproj | 0
.../win32/vs9/test-random-text.vcproj | 0
.../win32/vs9/test-state-hidden-performance.vcproj | 0
.../vs9/test-state-interactive-performance.vcproj | 0
.../win32/vs9/test-state-mini-performance.vcproj | 0
.../win32/vs9/test-state-performance.vcproj | 0
.../win32/vs9/test-state-pick-performance.vcproj | 0
.../win32/vs9/test-text-perf-performance.vcproj | 0
.../win32/vs9/test-text-perf.vcproj | 0
{build => build-aux}/win32/vs9/test-text.vcproj | 0
clutter.doap | 6 +-
clutter/Makefile.am | 24 +-
clutter/cex100/meson.build | 8 +
clutter/clutter-color.c | 2 +-
clutter/clutter-config.h.in | 7 +-
clutter/clutter-enum-types.h.in | 9 +-
clutter/clutter-script-parser.c | 2 +
clutter/clutter-types.h | 2 +-
clutter/gdk/clutter-input-device-gdk.c | 6 +
clutter/gdk/clutter-stage-gdk.c | 3 -
clutter/meson.build | 798 ++++++++++++
configure.ac | 19 +-
doc/BACKENDS.md | 208 +++
doc/{CODING_STYLE => CODING_STYLE.txt} | 0
doc/{HACKING => CONTRIBUTING.md} | 58 +-
doc/HACKING.backends | 207 ---
doc/Makefile.am | 10 +-
doc/{RELEASING => RELEASING.md} | 0
doc/common/Makefile.am | 10 -
doc/cookbook/Makefile.am | 5 +-
doc/{common => cookbook}/common.xsl | 0
doc/{common => cookbook}/cookbook.xsl | 0
doc/{common => cookbook}/devhelp.xsl | 0
doc/cookbook/examples/Makefile.am | 4 +-
doc/{common => cookbook}/html.xsl | 0
doc/cookbook/meson.build | 65 +
doc/{common => cookbook}/ref-html-style.xsl | 0
doc/{common => cookbook}/style.css | 0
doc/meson.build | 2 +
.../{clutter-docs.xml.in => clutter-docs.xml} | 12 +-
doc/reference/meson.build | 244 ++++
doc/reference/xml/gtkdocentities.ent.in | 8 +
doc/reference/xml/meson.build | 15 +
examples/Makefile.am | 4 +-
examples/meson.build | 41 +
examples/threads.c | 2 +-
meson.build | 172 +++
meson_options.txt | 32 +
po/meson.build | 6 +
tests/Makefile.am | 5 +-
tests/accessibility/Makefile.am | 4 +-
tests/accessibility/meson.build | 0
tests/{clutter-1.0.suppressions => clutter.supp} | 0
tests/conform/Makefile.am | 2 +-
tests/conform/meson.build | 94 ++
tests/conform/script-parser.c | 3 +
tests/conform/test.data.in | 3 +
tests/interactive/Makefile.am | 46 +-
tests/interactive/meson.build | 0
tests/meson.build | 11 +
tests/micro-bench/Makefile.am | 4 +-
tests/micro-bench/meson.build | 0
tests/performance/Makefile.am | 4 +-
tests/performance/meson.build | 0
162 files changed, 2060 insertions(+), 1739 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]