diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 6159f67df3438dca4fb6a0589a011eff767347b1..0000000000000000000000000000000000000000 --- a/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -SUBDIRS = data po src help - -MAINTAINERCLEANFILES = \ - $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ - $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) - -# We currently have no custom macros -GITIGNOREFILES = m4 - --include $(top_srcdir)/git.mk diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 3e2ff7485fc18f6cf1d94ba57e6353c9664fd920..0000000000000000000000000000000000000000 --- a/autogen.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. - -olddir=`pwd` - -cd $srcdir - -(test -f configure.ac) || { - echo "*** ERROR: Directory "\`$srcdir\'" does not look like the top-level project directory ***" - exit 1 -} - -# Use the style-checker as pre-commit and pre-applypatch hooks -if [ -d $srcdir/.git ]; then - for HOOK in pre-commit pre-applypatch; do - if [ ! -L $srcdir/.git/hooks/$HOOK ]; then - ln -s ../../../libgnome-games-support/style-checker \ - $srcdir/.git/hooks/$HOOK && echo "Enabled $HOOK style checker." - fi - done -fi - -PKG_NAME=`autoconf --trace 'AC_INIT:$1' configure.ac` - -if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then - echo "*** WARNING: I am going to run \`configure' with no arguments." >&2 - echo "*** If you wish to pass any to it, please specify them on the" >&2 - echo "*** \`$0\' command line." >&2 - echo "" >&2 -fi - -aclocal --install || exit 1 -intltoolize --force --copy --automake || exit 1 -autoreconf --verbose --force --install -Wno-portability || exit 1 - -cd $olddir -if [ "$NOCONFIGURE" = "" ]; then - $srcdir/configure "$@" || exit 1 - - if [ "$1" = "--help" ]; then exit 0 else - echo "Now type \`make\' to compile $PKG_NAME" || exit 1 - fi -else - echo "Skipping configure process." -fi diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 7d4887f4c06faa19c1878f2396e149a009379d8d..0000000000000000000000000000000000000000 --- a/configure.ac +++ /dev/null @@ -1,66 +0,0 @@ -AC_PREREQ([2.63]) -AC_INIT([gnome-2048], [3.30.0], - [https://gitlab.gnome.org/GNOME/gnome-2048/issues], - [gnome-2048], [https://wiki.gnome.org/Apps/2048]) -AC_CONFIG_MACRO_DIR([m4]) - -AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) -AM_SILENT_RULES([yes]) -AM_MAINTAINER_MODE - -AM_PROG_VALAC([0.24.0]) -AM_PROG_CC_C_O - -GLIB_GSETTINGS - -APPSTREAM_XML - -dnl ########################################################################### -dnl Dependencies -dnl ########################################################################### - -GTK_REQUIRED=3.12.0 -CLUTTER_REQUIRED=1.12.0 -CLUTTER_GTK_REQUIRED=1.6.0 -GEE_REQUIRED=0.14.0 - -PKG_CHECK_MODULES(GNOME_2048, [ - gtk+-3.0 >= $GTK_REQUIRED - clutter-1.0 >= $CLUTTER_REQUIRED - clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED - gee-0.8 >= $GEE_REQUIRED - libgnome-games-support-1 -]) - -AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true]) - -GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0` -AC_SUBST(GLIB_COMPILE_RESOURCES) - -dnl ########################################################################### -dnl Internationalization -dnl ########################################################################### - -IT_PROG_INTLTOOL([0.50]) -AC_SUBST(GETTEXT_PACKAGE, gnome-2048) - -dnl ########################################################################### -dnl Documentation -dnl ########################################################################### - -YELP_HELP_INIT - -dnl ########################################################################### -dnl Files to generate -dnl ########################################################################### - -AC_CONFIG_FILES([ -Makefile -po/Makefile.in -data/Makefile -data/icons/Makefile -data/icons/hicolor/Makefile -src/Makefile -help/Makefile -]) -AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index e21a5b50436900a4ae2ee2c7a6cd550b26862d91..0000000000000000000000000000000000000000 --- a/data/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -SUBDIRS = icons - -dist_noinst_DATA = \ - congrats.ui \ - mainwindow.ui \ - menus.ui \ - preferences.ui \ - style.css - -gsettings_SCHEMAS = org.gnome.2048.gschema.xml -@GSETTINGS_RULES@ - -desktopdir = $(datadir)/applications -desktop_in_files = org.gnome.gnome-2048.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ - -appstream_in_files = org.gnome.gnome-2048.appdata.xml.in -appstream_XML = $(appstream_in_files:.xml.in=.xml) -@APPSTREAM_XML_RULES@ -@INTLTOOL_XML_RULE@ - -EXTRA_DIST = \ - $(appstream_in_files) \ - $(gsettings_SCHEMAS) \ - $(desktop_in_files) - -CLEANFILES = \ - $(appstream_XML) \ - $(desktop_DATA) - -check-local: $(desktop_DATA) - $(DESKTOP_FILE_VALIDATE) $(desktop_DATA) - -DISTCHECK_CONFIGURE_FLAGS == --enable-appdata-check - --include $(top_srcdir)/git.mk diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am deleted file mode 100644 index e9b9c060d1011cdf7f6d385263b35504e1616b23..0000000000000000000000000000000000000000 --- a/data/icons/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = hicolor - --include $(top_srcdir)/git.mk diff --git a/data/icons/hicolor/Makefile.am b/data/icons/hicolor/Makefile.am deleted file mode 100644 index e9ce7207a5337fd974d6c30048d7262d44e15f3f..0000000000000000000000000000000000000000 --- a/data/icons/hicolor/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -icon16dir=$(datadir)/icons/hicolor/16x16/apps -icon22dir=$(datadir)/icons/hicolor/22x22/apps -icon24dir=$(datadir)/icons/hicolor/24x24/apps -icon32dir=$(datadir)/icons/hicolor/32x32/apps -icon48dir=$(datadir)/icons/hicolor/48x48/apps -icon256dir=$(datadir)/icons/hicolor/256x256/apps -icon512dir=$(datadir)/icons/hicolor/512x512/apps -iconsymbolicdir=$(datadir)/icons/hicolor/symbolic/apps - -icon16_DATA = 16x16/gnome-2048.png -icon22_DATA = 22x22/gnome-2048.png -icon24_DATA = 24x24/gnome-2048.png -icon32_DATA = 32x32/gnome-2048.png -icon48_DATA = 48x48/gnome-2048.png -icon256_DATA = 256x256/gnome-2048.png -icon512_DATA = 512x512/gnome-2048.png -iconsymbolic_DATA = symbolic/gnome-2048-symbolic.svg - -EXTRA_DIST = $(icon16_DATA) $(icon22_DATA) $(icon24_DATA) $(icon32_DATA) $(icon48_DATA) $(icon256_DATA) $(icon512_DATA) $(iconsymbolic_DATA) - --include $(top_srcdir)/git.mk diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 0000000000000000000000000000000000000000..40676bab256e6642bcf7943358f69b1777d61e28 --- /dev/null +++ b/data/meson.build @@ -0,0 +1,58 @@ +icon_sizes = [ + '16x16', + '22x22', + '24x24', + '32x32', + '48x48', + '256x256', + '512x512', +] +foreach size : icon_sizes + install_data( + join_paths('icons', 'hicolor', size, 'gnome-2048.png'), + install_dir: join_paths(datadir, 'icons', 'hicolor', size, 'apps'), + ) +endforeach +install_data( + join_paths('icons', 'hicolor', 'symbolic', 'gnome-2048-symbolic.svg'), + install_dir: join_paths(datadir, 'icons', 'hicolor', 'symbolic', 'apps'), +) + +install_data( + 'org.gnome.2048.gschema.xml', + install_dir: schemadir, +) +meson.add_install_script('glib-compile-schemas', schemadir) + +desktop_file = i18n.merge_file( + 'desktop-file', + input: 'org.gnome.gnome-2048.desktop.in', + output: 'org.gnome.gnome-2048.desktop', + install: true, + install_dir: join_paths(datadir, 'applications'), + po_dir: podir, + type: 'desktop', +) +if desktop_file_validate.found() + test( + 'Validating @0@'.format(desktop_file), + desktop_file_validate, + args: [desktop_file], + ) +endif + +appdata_file = i18n.merge_file( + 'appdata-file', + input: 'org.gnome.gnome-2048.appdata.xml.in', + output: 'org.gnome.gnome-2048.appdata.xml', + install: true, + install_dir: join_paths(datadir, 'metainfo'), + po_dir: podir, +) +if appstream_util.found() + test( + 'Validating @0@'.format(appdata_file), + appstream_util, + args: ['validate', '--nonet', appdata_file], + ) +endif diff --git a/data/org.gnome.gnome-2048.appdata.xml.in b/data/org.gnome.gnome-2048.appdata.xml.in index 171f20aae72d49ac38c4a3d79500f506c8f92b25..a9953bf192419692d83a4b51f1397e554cf36158 100644 --- a/data/org.gnome.gnome-2048.appdata.xml.in +++ b/data/org.gnome.gnome-2048.appdata.xml.in @@ -5,35 +5,35 @@ org.gnome.gnome-2048.desktop CC-BY-SA-3.0 GPL-3.0+ - <_name>GNOME 2048 - <_summary>Obtain the 2048 tile + GNOME 2048 + Obtain the 2048 tile - <_p> +

Play the highly addictive 2048 game. GNOME 2048 is a clone of the popular single-player puzzle game. Gameplay consists of joining numbers in a grid and obtain the 2048 tile. - - <_p> +

+

Use your keyboard's arrow keys to slide all tiles in the desired direction. Be careful: all tiles slide to their farthest possible positions, you cannot slide just one tile or one row or column. Tiles with the same value are joined when slided one over the other. - - <_p> +

+

With every new tile obtained you increase your score. If you think you can easily get the 2048 tile, do not let it stop you, the game does not end there, you can continue joining tiles and improving your score. - - <_p> +

+

Originally created by Gabriele Cirulli, 2048 has gained much popularity due to it being highly addictive. Cirulli's 2048 is in turn a clone of the 1024 game and includes ideas from other clones. - +

https://gitlab.gnome.org/GNOME/gnome-2048/raw/master/data/screenshot.png - <_caption>A running game having reached the 2048 tile + A running game having reached the 2048 tile https://wiki.gnome.org/Apps/2048 @@ -42,7 +42,7 @@ arnaud.bonatti_at_gmail.com GNOME - <_developer_name>The GNOME Project + The GNOME Project AppMenu diff --git a/data/org.gnome.gnome-2048.desktop.in b/data/org.gnome.gnome-2048.desktop.in index 70860eb7ba5f30667e1db0172f571b4601b13eca..6ad90350ab25b4106acdb993c66becfabf4af954 100644 --- a/data/org.gnome.gnome-2048.desktop.in +++ b/data/org.gnome.gnome-2048.desktop.in @@ -1,11 +1,13 @@ [Desktop Entry] -_Name=2048 -_Comment=Obtain the 2048 tile +Name=2048 +Comment=Obtain the 2048 tile TryExec=gnome-2048 Exec=gnome-2048 +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=gnome-2048 Terminal=false Type=Application StartupNotify=true Categories=GNOME;GTK;Game; -_Keywords=puzzle; +# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +Keywords=puzzle; diff --git a/git.mk b/git.mk deleted file mode 100644 index 5467b86a7612bb44a0132e99b7c210a46bb12e6e..0000000000000000000000000000000000000000 --- a/git.mk +++ /dev/null @@ -1,303 +0,0 @@ -# git.mk -# -# Copyright 2009, Red Hat, Inc. -# Copyright 2010,2011,2012,2013 Behdad Esfahbod -# Written by Behdad Esfahbod -# -# Copying and distribution of this file, with or without modification, -# is permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. -# -# The latest version of this file can be downloaded from: -# https://raw.github.com/behdad/git.mk/master/git.mk -# Bugs, etc, should be reported upstream at: -# https://github.com/behdad/git.mk -# -# To use in your project, import this file in your git repo's toplevel, -# then do "make -f git.mk". This modifies all Makefile.am files in -# your project to -include git.mk. Remember to add that line to new -# Makefile.am files you create in your project, or just rerun the -# "make -f git.mk". -# -# This enables automatic .gitignore generation. If you need to ignore -# more files, add them to the GITIGNOREFILES variable in your Makefile.am. -# But think twice before doing that. If a file has to be in .gitignore, -# chances are very high that it's a generated file and should be in one -# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES. -# -# The only case that you need to manually add a file to GITIGNOREFILES is -# when remove files in one of mostlyclean-local, clean-local, distclean-local, -# or maintainer-clean-local make targets. -# -# Note that for files like editor backup, etc, there are better places to -# ignore them. See "man gitignore". -# -# If "make maintainer-clean" removes the files but they are not recognized -# by this script (that is, if "git status" shows untracked files still), send -# me the output of "git status" as well as your Makefile.am and Makefile for -# the directories involved and I'll diagnose. -# -# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see -# Makefile.am.sample in the git.mk git repo. -# -# Don't EXTRA_DIST this file. It is supposed to only live in git clones, -# not tarballs. It serves no useful purpose in tarballs and clutters the -# build dir. -# -# This file knows how to handle autoconf, automake, libtool, gtk-doc, -# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu. -# -# This makefile provides the following targets: -# -# - all: "make all" will build all gitignore files. -# - gitignore: makes all gitignore files in the current dir and subdirs. -# - .gitignore: make gitignore file for the current dir. -# - gitignore-recurse: makes all gitignore files in the subdirs. -# -# KNOWN ISSUES: -# -# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the -# submodule doesn't find us. If you have configure.{in,ac} files in -# subdirs, add a proxy git.mk file in those dirs that simply does: -# "include $(top_srcdir)/../git.mk". Add more ..'s to your taste. -# And add those files to git. See vte/gnome-pty-helper/git.mk for -# example. -# - - - -############################################################################### -# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES: -############################################################################### - -# -# Most autotools-using modules should be fine including this variable in their -# toplevel MAINTAINERCLEANFILES: -GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \ - $(srcdir)/aclocal.m4 \ - $(srcdir)/autoscan.log \ - $(srcdir)/configure.scan \ - `AUX_DIR=$(srcdir)/$$($(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' $(srcdir)/configure.ac); \ - test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \ - for x in \ - ar-lib \ - compile \ - config.guess \ - config.sub \ - depcomp \ - install-sh \ - ltmain.sh \ - missing \ - mkinstalldirs \ - ; do echo "$$AUX_DIR/$$x"; done` \ - `$(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' $(srcdir)/configure.ac | \ - head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done` -# -# All modules should also be fine including the following variable, which -# removes automake-generated Makefile.in files: -GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \ - `$(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' $(srcdir)/configure.ac | \ - while read f; do \ - case $$f in Makefile|*/Makefile) \ - test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \ - done` -# -# Modules that use libtool /and/ use AC_CONFIG_MACRO_DIR([m4]) may also -# include this: -GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \ - $(srcdir)/m4/libtool.m4 \ - $(srcdir)/m4/ltoptions.m4 \ - $(srcdir)/m4/ltsugar.m4 \ - $(srcdir)/m4/ltversion.m4 \ - $(srcdir)/m4/lt~obsolete.m4 - - - -############################################################################### -# Default rule is to install ourselves in all Makefile.am files: -############################################################################### - -git-all: git-mk-install - -git-mk-install: - @echo "Installing git makefile" - @any_failed=; \ - find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \ - if grep 'include .*/git.mk' $$x >/dev/null; then \ - echo "$$x already includes git.mk"; \ - else \ - failed=; \ - echo "Updating $$x"; \ - { cat $$x; \ - echo ''; \ - echo '-include $$(top_srcdir)/git.mk'; \ - } > $$x.tmp || failed=1; \ - if test x$$failed = x; then \ - mv $$x.tmp $$x || failed=1; \ - fi; \ - if test x$$failed = x; then : else \ - echo "Failed updating $$x"; >&2 \ - any_failed=1; \ - fi; \ - fi; done; test -z "$$any_failed" - -.PHONY: git-all git-mk-install - - - -############################################################################### -# Actual .gitignore generation: -############################################################################### - -$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk - @echo "git.mk: Generating $@" - @{ \ - if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \ - for x in \ - $(DOC_MODULE)-decl-list.txt \ - $(DOC_MODULE)-decl.txt \ - tmpl/$(DOC_MODULE)-unused.sgml \ - "tmpl/*.bak" \ - xml html \ - ; do echo "/$$x"; done; \ - fi; \ - if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ - for lc in $(DOC_LINGUAS); do \ - for x in \ - $(if $(DOC_MODULE),$(DOC_MODULE).xml) \ - $(DOC_PAGES) \ - $(DOC_INCLUDES) \ - ; do echo "/$$lc/$$x"; done; \ - done; \ - for x in \ - $(_DOC_OMF_ALL) \ - $(_DOC_DSK_ALL) \ - $(_DOC_HTML_ALL) \ - $(_DOC_MOFILES) \ - $(DOC_H_FILE) \ - "*/.xml2po.mo" \ - "*/*.omf.out" \ - ; do echo /$$x; done; \ - fi; \ - if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \ - for lc in $(HELP_LINGUAS); do \ - for x in \ - $(HELP_FILES) \ - "$$lc.stamp" \ - "$$lc.mo" \ - ; do echo "/$$lc/$$x"; done; \ - done; \ - fi; \ - if test "x$(gsettings_SCHEMAS)" = x; then :; else \ - for x in \ - $(gsettings_SCHEMAS:.xml=.valid) \ - $(gsettings__enum_file) \ - ; do echo "/$$x"; done; \ - fi; \ - if test -f $(srcdir)/po/Makefile.in.in; then \ - for x in \ - po/Makefile.in.in \ - po/Makefile.in.in~ \ - po/Makefile.in \ - po/Makefile \ - po/Makevars.template \ - po/POTFILES \ - po/Rules-quot \ - po/stamp-it \ - po/.intltool-merge-cache \ - "po/*.gmo" \ - "po/*.header" \ - "po/*.mo" \ - "po/*.sed" \ - "po/*.sin" \ - po/$(GETTEXT_PACKAGE).pot \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - ; do echo "/$$x"; done; \ - fi; \ - if test -f $(srcdir)/configure; then \ - for x in \ - autom4te.cache \ - configure \ - config.h \ - stamp-h1 \ - libtool \ - config.lt \ - ; do echo "/$$x"; done; \ - fi; \ - if test "x$(DEJATOOL)" = x; then :; else \ - for x in \ - $(DEJATOOL) \ - ; do echo "/$$x.sum"; echo "/$$x.log"; done; \ - echo /site.exp; \ - fi; \ - if test "x$(am__dirstamp)" = x; then :; else \ - echo "$(am__dirstamp)"; \ - fi; \ - if test "x$(LTCOMPILE)" = x; then :; else \ - for x in \ - "*.lo" \ - ".libs" "_libs" \ - ; do echo "$$x"; done; \ - fi; \ - for x in \ - .gitignore \ - $(GITIGNOREFILES) \ - $(CLEANFILES) \ - $(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \ - $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \ - $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \ - so_locations \ - $(MOSTLYCLEANFILES) \ - $(TEST_LOGS) \ - $(TEST_LOGS:.log=.trs) \ - $(TEST_SUITE_LOG) \ - "*.$(OBJEXT)" \ - $(DISTCLEANFILES) \ - $(am__CONFIG_DISTCLEAN_FILES) \ - $(CONFIG_CLEAN_FILES) \ - TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ - "*.tab.c" \ - $(MAINTAINERCLEANFILES) \ - $(BUILT_SOURCES) \ - $(DEPDIR) \ - $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \ - $(filter %_vala.stamp,$(DIST_COMMON)) \ - $(filter %.vapi,$(DIST_COMMON)) \ - $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))) \ - Makefile \ - Makefile.in \ - "*.orig" \ - "*.rej" \ - "*.bak" \ - "*~" \ - ".*.sw[nop]" \ - ".dirstamp" \ - ; do echo "/$$x"; done; \ - } | \ - sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ - sed 's@/[.]/@/@g' | \ - LC_ALL=C sort | uniq > $@.tmp && \ - mv $@.tmp $@; - -all: $(srcdir)/.gitignore gitignore-recurse-maybe -gitignore: $(srcdir)/.gitignore gitignore-recurse - -gitignore-recurse-maybe: - @for subdir in $(DIST_SUBDIRS); do \ - case " $(SUBDIRS) " in \ - *" $$subdir "*) :;; \ - *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \ - esac; \ - done -gitignore-recurse: - @for subdir in $(DIST_SUBDIRS); do \ - test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \ - done - -maintainer-clean: gitignore-clean -gitignore-clean: - -rm -f $(srcdir)/.gitignore - -.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe diff --git a/help/LINGUAS b/help/LINGUAS new file mode 100644 index 0000000000000000000000000000000000000000..e614b516bdc28aa4e21990764546b36ad8887d53 --- /dev/null +++ b/help/LINGUAS @@ -0,0 +1,9 @@ +# Please keep this list sorted alphabetically +cs +de +el +es +hu +pl +pt_BR +sv diff --git a/help/Makefile.am b/help/Makefile.am deleted file mode 100644 index ef58f415b74b795649c2d7412948215ddb892d34..0000000000000000000000000000000000000000 --- a/help/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -@YELP_HELP_RULES@ -HELP_ID = gnome-2048 - -HELP_MEDIA = \ - media/gnome-2048.png \ - media/gnome-204822.png - -HELP_FILES = \ - index.page - -HELP_LINGUAS = cs de el es hu pl pt_BR sv - --include $(top_srcdir)/git.mk diff --git a/help/meson.build b/help/meson.build new file mode 100644 index 0000000000000000000000000000000000000000..d4dc51e8565c7440eb0d15ad3f8427e3c164c9ef --- /dev/null +++ b/help/meson.build @@ -0,0 +1,10 @@ +gnome.yelp( + 'gnome-2048', + media: [ + 'media/gnome-2048.png', + 'media/gnome-204822.png', + ], + sources: [ + 'index.page', + ], +) diff --git a/meson.build b/meson.build new file mode 100644 index 0000000000000000000000000000000000000000..d236fbd6cc8d4a921f12daa10ed00eedabb78635 --- /dev/null +++ b/meson.build @@ -0,0 +1,35 @@ +project( + 'gnome-2048', ['vala', 'c'], + version: '3.30.0', + license: 'GPLv3+', + meson_version: '>= 0.37.1', +) + +gnome = import('gnome') +i18n = import('i18n') + +valac = meson.get_compiler('vala') + +# Paths +localedir = join_paths(get_option('prefix'), get_option('localedir')) +datadir = join_paths(get_option('prefix'), get_option('datadir')) +pkgdatadir = join_paths(datadir, 'gnome-2048') +schemadir = join_paths(datadir, 'glib-2.0', 'schemas') + +podir = join_paths(meson.current_source_dir(), 'po') + +# Dependencies +posix = valac.find_library('posix') +gtk = dependency('gtk+-3.0', version: '>= 3.12.0') +clutter = dependency('clutter-1.0', version: '>= 1.12.0') +clutter_gtk = dependency('clutter-gtk-1.0', version: '>= 1.6.0') +gee = dependency('gee-0.8', version: '>= 0.14.0') +libgnome_games_support = dependency('libgnome-games-support-1') + +appstream_util = find_program('appstream-util', required: false) +desktop_file_validate = find_program('desktop-file-validate', required: false) + +subdir('po') +subdir('data') +subdir('help') +subdir('src') diff --git a/po/meson.build b/po/meson.build new file mode 100644 index 0000000000000000000000000000000000000000..ad0be769a4ea9a69d74a0ac5863e94f726580e66 --- /dev/null +++ b/po/meson.build @@ -0,0 +1,4 @@ +i18n.gettext( + 'gnome-2048', + preset: 'glib', +) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index c12481c4b8bdca77cbc09f3d43ebef296d5e5251..0000000000000000000000000000000000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -bin_PROGRAMS = gnome-2048 - -gnome_2048_SOURCES = \ - config.vapi \ - application.vala \ - game.vala \ - grid.vala \ - view.vala \ - gnome-2048-data.h \ - gnome-2048-data.c - -gnome_2048_CFLAGS = \ - -DVERSION=\"$(VERSION)\" \ - -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ - -DDATA_DIRECTORY=\"$(datadir)/gnome-2048\" \ - -DLOCALEDIR=\"$(datadir)/locale\" \ - $(GNOME_2048_CFLAGS) \ - -w - -gnome_2048_VALAFLAGS = \ - --pkg posix \ - --pkg gtk+-3.0 \ - --pkg pango \ - --pkg pangocairo \ - --pkg clutter-1.0 \ - --pkg clutter-gtk-1.0 \ - --pkg cogl-1.0 \ - --pkg gee-0.8 \ - --pkg libgnome-games-support-1 - -gnome_2048_LDADD = \ - $(GNOME_2048_LIBS) \ - -lm - -data_files = $(shell $(GLIB_COMPILE_RESOURCES) \ - --sourcedir=$(top_srcdir) \ - --generate-dependencies gnome-2048.gresource.xml) - -gnome-2048-data.h: gnome-2048.gresource.xml $(data_files) - $(AM_V_GEN) \ - $(GLIB_COMPILE_RESOURCES) \ - --target=$@ \ - --sourcedir=$(top_srcdir) \ - --generate \ - --c-name gnome_2048_data $< -gnome-2048-data.c: gnome-2048.gresource.xml $(data_files) - $(AM_V_GEN) \ - $(GLIB_COMPILE_RESOURCES) \ - --target=$@ \ - --sourcedir=$(top_srcdir) \ - --generate \ - --c-name gnome_2048_data $< - -EXTRA_DIST = \ - gnome-2048.gresource.xml \ - $(data_files) - -MAINTAINERCLEANFILES = \ - gnome-2048-data.h \ - gnome-2048-data.c - --include $(top_srcdir)/git.mk diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000000000000000000000000000000000000..3b8dd2b2455e0573f6727237f46b8ac2cb3e83a6 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,34 @@ +resources = gnome.compile_resources( + 'resources', + 'gnome-2048.gresource.xml', + source_dir: '..', + c_name: 'resources', +) + +gnome_2048_sources = [ + 'application.vala', + 'config.vapi', + 'game.vala', + 'grid.vala', + 'view.vala', +] + resources + +gnome_2048 = executable( + 'gnome-2048', + gnome_2048_sources, + dependencies: [ + posix, + gtk, + clutter, + clutter_gtk, + gee, + libgnome_games_support, + ], + c_args: [ + '-DVERSION="@0@"'.format(meson.project_version()), + '-DGETTEXT_PACKAGE="gnome-2048"', + '-DDATA_DIRECTORY="@0@"'.format(pkgdatadir), + '-DLOCALEDIR="@0@"'.format(localedir), + ], + install: true, +)