meson: fix build with meson 0.61.0

Summary: input requires a file, not a dir. Anyway, @INPUT@is not used

Test Plan: compilation

Reviewers: raster, netstar

Subscribers: juippis

Differential Revision: https://phab.enlightenment.org/D12324

.gitignore

@@ -11,15 +11,20 @@
 .dirstamp
 .edi
 
+*.swp
+
+/build
 /src/bin/edi
 /src/bin/edi_build
+/src/bin/edi_scm
 /data/desktop/edi.desktop
-/data/extra/skeleton/*.tar.gz
+/data/extra/templates/*.tar.gz
 /doc/edi.1
 edi-*.tar.?z*
 po/*.gmo
 po/POTFILES
 .libs
+pc/edi.pc
 
 # autotools crap
 m4/*.m4
@@ -46,6 +51,7 @@ stamp-h1
 ar-lib
 test-driver
 test-suite.log
+compile_commands.json
 
 # gettext crap
 ABOUT-NLS
@@ -67,16 +73,3 @@ po/stamp-po
 /src/tests/test-suite.log
 /src/tests/check-results.xml
 
-/elm_code/src/lib/*.eo.h
-/elm_code/src/lib/*.eo.legacy.h
-/elm_code/src/lib/*.eo.c
-/elm_code/src/lib/widget/*.eo.h
-/elm_code/src/lib/widget/*.eo.legacy.h
-/elm_code/src/lib/widget/*.eo.c
-
-/elm_code/src/bin/elm_code_test
-
-/elm_code/src/tests/elm_code_suite
-/elm_code/src/tests/elm_code_suite.*
-/elm_code/src/tests/test-suite.log
-/elm_code/src/tests/check-results.xml

AUTHORS

@@ -1,5 +1,8 @@
-ajwillia.ms (Andy Williams) <andy@andywilliams.me>
-wilsonk     (Kelly Wilson)  <wilsonk@cpsc.ucalgary.ca>
+ajwillia.ms (Andy Williams)   <andy@andywilliams.me>
+netstar     (Alastair Poole)  <netstar@gmail.com>
+okra        (Stephen Houston) <smhouston88@gmail.com>
+wilsonk     (Kelly Wilson)    <wilsonk@cpsc.ucalgary.ca>
+YOhoho      (YeongJong Lee)   <cleanlyj@naver.com>
 
 Windows compatibility thanks to Vincent Torri <vincent.torri@gmail.com>
 Icon created by The Rasterman (Carsten Haitzler) <raster@rasterman.com>
@@ -8,7 +11,3 @@ With sections from Ecrire by Tom Hacohen <tom@stosb.com>
 Clang syntax higlighting from cedric and TAsn in the edi PROTO project
 
 
-Elm_Code module (which will be extracted at some point) by:
-
-ajwillia.ms (Andy Williams) <andy@andywilliams.me>
-

COPYING

@@ -1,4 +1,4 @@
-EDI contains two different licenses, this is due to it being the
+EDI contains three different licenses, this is due to it being the
 development space for various components that expect to be 
 moved to the Enlightenment Foundation Libraries in the future.
 
@@ -6,6 +6,17 @@ With the exception of "edi" which constitutes all remaining work
 in this code base the licenses apply to projects within their
 own top level directory. The project licenses are as follows:
 
-elm_code:	COPYING.LGPG
-edi:		COPYING.GPLv2
+data/extra/templates/    No license - public domain
+
+Icons by <matthieu.james@gmail.com> from "Faenza" icon theme:
+    COPYING.GPLv2:
+            data/extra/templates/images/c.png
+            data/extra/templates/images/python.png
+            data/icons/*.png
+
+Icons by Marcus (madmaxms) from "Obsidian" icon theme.
+    COPYING.GPLv3:
+        data/extra/examples/images/mono-runtime.png
+
+edi:    COPYING.GPLv2
 

COPYING.GPLv3

@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    {project}  Copyright (C) {year}  {fullname}
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

INSTALL

@@ -1,370 +1,66 @@
-Installation Instructions
-*************************
+** COMPILING and INSTALLING **
+------------------------------
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
+Meson is the build system used for this project. For more information please
+see:
 
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
+    http://mesonbuild.com
 
-Basic Installation
-==================
+----
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
+Normal compilation in /usr/local:
 
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+    meson . build
+    ninja -C build
+    sudo ninja -C build install
 
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
+Normal compilation without libclang:
 
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
+   meson build -Dlibclang=false
+   ninja -C build
+   sudo ninja -C build install
 
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+For meson build generic options:
 
-   The simplest way to compile this package is:
+    meson --help
 
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
+For a list of project specific options supported:
 
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
+    cat meson_options.txt
 
-  2. Type `make' to compile the package.
+To set 1 or more project specific options:
 
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
+    meson --prefix=/path/to -Doption=value [-Dother=value2] [...] . build
 
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
+To display current configuration:
 
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
+    mesonconf build
 
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
+The above will only work after at least the following is done:
 
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
+    meson . build
 
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
+** QUICK AND DIRTY HELP **
+--------------------------
 
-Compilers and Options
-=====================
+How to clean out the build and config and start fresh:
 
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
+    rm -rf build
 
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
+How to make a dist tarball and check its build:
+(must do it from git tree clone and commit all changes to git first)
 
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+    ninja -C build dist
 
-   *Note Defining Variables::, for more details.
+How to change prefix:
 
-Compiling For Multiple Architectures
-====================================
+    meson --prefix=/path/to/prefix . build
 
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
+How to install in a specific destination directory for packaging:
 
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
+    DESTDIR=/path/to/destdir ninja -C build install
 
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
+How to build with verbose output (full commands run):
 
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
+    ninja -C build -v
 
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
-
-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.

Makefile.am

@@ -1,97 +0,0 @@
-MAINTAINERCLEANFILES = \
-	ABOUT-NLS \
-	Makefile.in \
-	aclocal.m4 \
-	compile \
-	config.guess \
-	config.h.in \
-	config.rpath \
-	config.sub \
-	configure \
-	depcomp \
-	install-sh \
-	ltmain.sh \
-	missing \
-	m4/intl.m4 \
-	m4/intldir.m4 \
-	m4/intlmacosx.m4 \
-	m4/libtool.m4 \
-	m4/ltoptions.m4 \
-	m4/ltsugar.m4 \
-	m4/ltversion.m4 \
-	m4/lt~obsolete.m4 \
-	po/boldquot.sed \
-	po/en@boldquot.header \
-	po/en@quot.header \
-	po/insert-header.sin \
-	po/Makefile.in.in \
-	po/Makevars.template \
-	po/quot.sed \
-	po/remove-potcdate.sin \
-	po/Rules-quot \
-	$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
-	$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
-
-SUBDIRS = data doc packaging po elm_code src
-
-ACLOCAL_AMFLAGS = -I m4
-
-filesdir = $(docdir)
-files_DATA = \
-	AUTHORS \
-	COPYING \
-	COPYING.LGPL \
-	COPYING.GPLv2 \
-	ChangeLog \
-	INSTALL \
-	NEWS \
-	README \
-	TODO
-
-EXTRA_DIST = \
-	autogen.sh \
-	COPYING.LGPL \
-	COPYING.GPLv2 \
-	config.rpath \
-	configure \
-	m4/efl_binary.m4 \
-	m4/efl_compiler_flag.m4 \
-	m4/efl_path_max.m4
-
-if EFL_HAVE_LCOV
-
-lcov-reset:
-	@rm -rf $(top_builddir)/coverage
-	@find $(top_builddir) -name "*.gcda" -delete
-	@lcov --zerocounters --directory $(top_builddir)
-
-lcov-report:
-	@mkdir $(top_builddir)/coverage
-	lcov --capture --compat-libtool --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir)/src/lib --base-directory $(top_srcdir)/src/lib
-	lcov --remove $(top_builddir)/coverage/coverage.info '*.h' --output-file $(top_builddir)/coverage/coverage.cleaned.info
-	lcov --remove $(top_builddir)/coverage/coverage.cleaned.info '*/tests/*' --output-file $(top_builddir)/coverage/coverage.cleaned2.info
-	genhtml --branch-coverage -t "$(PACKAGE_STRING)" -o $(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned2.info
-	@echo "Coverage Report at $(top_builddir)/coverage/html"
-
-endif
-
-if EFL_HAVE_TESTS
-
-TESTS = elm_code/src/tests/elm_code_suite src/tests/edi_suite
-
-lcov-check:
-if EFL_HAVE_LCOV
-	@$(MAKE) $(AM_MAKEFLAGS) lcov-reset
-endif
-	@$(MAKE) $(AM_MAKEFLAGS) check
-if EFL_HAVE_LCOV
-	@$(MAKE) $(AM_MAKEFLAGS) lcov-report
-endif
-
-endif
-
-# cleaning
-
-clean-local:
-	rm -rf benchmark coverage
-

Makefile_Edje_Helper.am

@@ -1,9 +0,0 @@
-EDJE_CC = @edje_cc@
-EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
-EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
-EDJE_CC_FLAGS_VERBOSE_1 = -v
-EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -fastdecomp -id $(srcdir) -fd $(srcdir)
-
-AM_V_EDJ = $(am__v_EDJ_@AM_V@)
-am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
-am__v_EDJ_0 = @echo "  EDJ   " $@;

Makefile_Eolian_Helper.am

@@ -1,24 +0,0 @@
-if HAVE_EOLIAN_GEN
-EOLIAN_GEN = @eolian_gen@
-_EOLIAN_GEN_DEP = @eolian_gen@
-else
-EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT}
-_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT}
-endif
-
-AM_V_EOL = $(am__v_EOL_@AM_V@)
-am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@)
-am__v_EOL_0 = @echo "  EOLIAN  " $@;
-
-SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h
-
-%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
-	$(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gc -o $@ $<
-
-%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
-	$(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $<
-
-%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
-	$(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $<
-
-CLEANFILES += $(BUILT_SOURCES)

NEWS

@@ -1,3 +1,156 @@
+=======
+Edi 0.8
+=======
+
+Features:
+
+  * C# syntax-highlighting and project support.
+  * UI rearrangement.
+  * Internal icons.
+  * Toolbar configurable.
+  * Tab movement (dragging).
+  * Tab bar mouse scrolling.
+  * Support for EDI as standalone text editor.
+  * Improved mime type handling.
+  * Complete widget configuration in settings.
+  * API additions and improvements.
+  * Move all examples to meson.
+
+Bug fixes:
+
+  * Debugging reliability.
+  * SCM filepanel improvements.
+  * Fix wizard reliablity.
+  * Search stabililty improvements.
+  * Fixes and improvements for FreeBSD and OpenBSD.
+  * Transparancy fixes.
+  * Many stability fixes.
+  * Improvements to the EFL code widget.
+  * Improve file save behaviour.
+  * Fix welcome content black hole (Escape).
+
+=======
+Edi 0.7
+=======
+
+Features:
+
+  * Added theme support and new themes.
+  * Added editor translucency option.
+  * Added option to show hidden files
+
+Bug fixes:
+
+  * Fix issues where panels would change size or not fully shrink
+  * Improvements to the UI and flow
+  * General stability fixes with Edi and Edi SCM
+
+---------
+Edi 0.6.1
+---------
+
+Features:
+
+  * Added notification support.
+  * Added split-view option for editors.
+  * Updated project wizard and added new project templates.
+  * Include EFL examples in project wizard.
+  * Add support for Go projects.
+  * Improved debugging support.
+  * Added edi_scm helper command.
+  * Replace all in project.
+
+Bug fixes:
+
+  * overall stability of the SCM git integration
+
+=======
+Edi 0.6
+=======
+
+Features:
+
+  * Multiple panel support in main UI
+  * Integrate GDB debugger console
+  * Add snippet support to the code editor
+  * Add SCM support (git)
+  * Provide tab completion & suggestions for autosuggest and snippets
+  * Add rust language and clang build support
+  * Highlight all search results
+  * Wrap search around at end of document
+  * Add checkout project to welcome screen
+  * Add translation support
+
+Bug fixes:
+
+  * Fix issue where large projects could cause slow starts
+  * Fix T6044 Project templating fails with special characters in projects settings
+  * Fix T5480 EDI does not open window on some mime/file types
+  * Fix T1852 Search should wrap around
+
+---------
+Edi 0.5.1
+---------
+
+Features:
+
+  * menu: Indicate saved status in menu and toolbar
+  * cmdline: don't try to open unknown file types
+
+Bug fixes:
+
+  * Fix issue where replaced text could not be undone
+  * Fix python project detection
+
+
+=======
+Edi 0.5
+=======
+
+Features:
+
+  * Add support for compile command databases with clang
+  * Add Undo/Redo support
+  * Add support for basic python projects
+  * Syntax highlighting support now includes python
+  * Add inline documentation lookup using libclang
+  * Add code autosuggest using libclang
+  * Add wrap-around in search
+  * Add double click to expand/contract in the file panel
+  * Add delete and open directory in terminal menu options in file panel
+  * Add a TODO/FIXME listing panel
+  * Add search in project
+
+Bug fixes:
+
+  * Fix issues with OpenBSD
+  * filepanel: Don't filter folders when searching for files
+  * Fix duplicate files in file listing panel
+  * Reset search term when activating search
+  * Improve portability of project creation
+  * Add pkgbuild support for libedi
+  * Fix tab bar to be more like tabs
+  * Fix various stability issues
+
+
+=======
+Edi 0.4
+=======
+
+Features:
+
+  * Auto-detected build provider for project
+  * Filter file list based on ignored build files
+  * Allow filtering of file list using regular expressions
+  * Display build errors inline in editor
+  * Support opening a single file
+
+Bug fixes:
+
+  * Fix some missing icons
+  * Fix about and settings window attributes
+
+
 =======
 Edi 0.3
 =======

README

@@ -1,36 +0,0 @@
-EDI - The Enlightened IDE
-===
-
-This is a project to create a complete IDE using the EFL.
-It aims to lower the barrier to getting involved in Enlightenment development
-and in creating apps based on the EFL suite.
-
-Requirements
----
-
-autotools
-EFL & Elementary from git master (>= 1.14.99)
-libclang-dev (or llvm-clang-devel)
-
-Installation
----
-
-Using autotools to install this software is the usual:
-
-# ./autogen.sh
-# make
-# sudo make install
-
-Usage
----
-
-After installing just launch
-
-# edi
-
-and it will prompt for a project (directory) location or you can specify like:
-
-# edi ~/Code/myproject
-
-to open the specified project.
-

README.md

@@ -1,25 +1,27 @@
-EDI - The Enlightened IDE
+Edi - The Enlightened IDE
 ===
 
 This is a project to create a complete IDE using the EFL.
 It aims to lower the barrier to getting involved in Enlightenment development
 and in creating apps based on the EFL suite.
 
-![EDI Logo](data/desktop/edi.png?raw=true)
+![Edi Logo](data/desktop/edi.png?raw=true)
 
 ## Requirements
 
-autotools
-EFL & Elementary from git master (>= 1.14.99)
+meson
+ninja
+EFL latest release (>= 1.24.0)
 libclang-dev (or llvm-clang-devel)
 
 ## Installation
 
-Using autotools to install this software is the usual:
+Using meson and ninja to install this software is the usual:
 
-    ./autogen.sh
-    make
-    sudo make install
+    meson build/
+    cd build
+    ninja
+    sudo ninja install
 
 ## Usage
 
@@ -33,3 +35,8 @@ and it will prompt for a project (directory) location or you can specify like:
 
 to open the specified project.
 
+Also included are handy utility apps that you can try
+
+    edi_build
+    edi_scm
+

TODO

@@ -1,18 +1,18 @@
-This project is in heavy development, we are currenty working towards the
-"Code aware editor" phase, the following work is still to be done:
+This project is under heavy and active development. We are working on
+both a "Code-aware editor" as well as the IDE functionality at the same
+time.
 
-* Redo changes that have been undone
-* Search / replace in project / directory
-* Integrate elm_code project (cedric, ajwillia-ms and TAsn)
-  - Code folding
-  - Automatic code indenting / formatting
-  - Code expansion (nested display of function call body)
-* Integrated console
-* notepad, emacs and vim and editing modes
-* Documentation finding
-* Compilation error message integrated in the flow of code
+Editor
+* Code folding
+* Automatic code indenting / formatting
+* notepad, emacs and vim and editing modes (key bindings)
+* LLVM parsing
 * Cross reference for c, c++ and some scripting language
+* Support for EditorConfig - http://editorconfig.org/
 
-The next phase is "Basic IDE" and it, along with other future phases
-are documented online at https://phab.enlightenment.org/w/edi/
+IDE
+* Integrated console
 
+Widget (elm_code_widget)
+* Improve the efficiency of the widget. Need to use much fewer
+textgrids where possible.

autogen.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-rm -rf autom4te.cache
-rm -f aclocal.m4 ltmain.sh
-
-echo "Running autopoint..." ; autopoint -f || :
-echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1
-echo "Running autoconf..." ; autoconf || exit 1
-echo "Running autoheader..." ; autoheader || exit 1
-echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
-echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
-
-if [ -z "$NOCONFIGURE" ]; then
-  ./configure "$@"
-fi

configure.ac

@@ -1,193 +0,0 @@
-EFL_VERSION([0], [2], [0])
-AC_INIT([edi], [efl_version], [enlightenment-devel@lists.sourceforge.net])
-
-AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([configure.ac])
-AC_CONFIG_HEADERS([config.h])
-
-AM_INIT_AUTOMAKE([1.10 dist-bzip2 -Wall color-tests subdir-objects])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-
-### Additional options to configure
-
-# Check for tests and coverage
-AC_ARG_WITH([tests],
-   [AS_HELP_STRING([--with-tests=none|regular|coverage],
-                   [choose testing method: regular, coverage or none.
-                    @<:@default=auto@:>@])],
-   [build_tests=${withval}],
-   [build_tests=auto])
-
-# clang support
-AC_ARG_ENABLE([libclang],
-   [AS_HELP_STRING([--disable-libclang], [Disable use of libclang. @<:@default=enable@:>@])],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       want_clang="yes"
-    else
-       want_clang="no"
-    fi
-   ],
-   [want_clang="yes"])
-
-
-### Checks for programs
-
-LT_PREREQ([2.2])
-LT_INIT([win32-dll pic-only])
-EFL_INIT
-
-AM_GNU_GETTEXT_VERSION([0.17])
-AM_GNU_GETTEXT([external])
-
-# if cross compiling, disable NLS support.
-# It's not worth the trouble, at least for now.
-if test "x$cross_compiling" = xyes; then
-  enable_nls=no
-fi
-
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-
-AC_PROG_CC
-
-PKG_PROG_PKG_CONFIG
-
-EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
-
-
-### Checks for libraries
-
-PKG_CHECK_MODULES([EFL],
-[
- eina >= 1.17.0
- evas >= 1.17.0
- ecore >= 1.17.0
- edje >= 1.17.0
- eo >= 1.17.0
- elementary >= 1.17.99
- eio >= 1.17.0
-])
-
-# Check edje_cc
-EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
-EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen])
-# Force the helper to try external eolian generators
-AM_CONDITIONAL([HAVE_EOLIAN_GEN], [true])
-
-# Needs to be moved into a macro, and also, needs a way to automatically fetch
-# from all the dependencies using the Requires.
-DEPS_EOLIAN_FLAGS=`${PKG_CONFIG} --variable=eolian_flags eo evas efl elementary`
-AC_SUBST([DEPS_EOLIAN_FLAGS])
-
-
-### Checks for header files
-
-
-### Checks for types
-
-
-### Checks for structures
-
-
-### Checks for compiler characteristics
-
-AM_PROG_CC_C_O
-
-EFL_CHECK_PATH_MAX
-EFL_COMPILER_FLAG([-Wall])
-EFL_COMPILER_FLAG([-Wextra])
-EFL_COMPILER_FLAG([-fvisibility=hidden])
-
-
-### Checks for linker characteristics
-
-
-### Checks for library functions
-
-AC_CHECK_FUNCS([setlocale])
-
-# this will speed up libtool checks
-
-
-# Checks for header files.
-
-have_clang="no"
-if test "${want_clang}" = "yes"; then
-  AC_CHECK_HEADERS([clang-c/Index.h], [have_clang="yes"], [have_clang="no"])
-fi
-
-EFL_TESTS([${build_tests}])
-
-# Checks for library functions.
-
-if test "${have_clang}" = "yes"; then
-   ldflags="$LDFLAGS"
-   LDFLAGS+=" -L${libdir}/llvm"
-   AC_CHECK_LIB([clang], [clang_Cursor_getArgument],
-      [
-       AC_DEFINE([HAVE_LIBCLANG], [1], [Set to 1 if clang is found])
-       EFL_LIBS="${EFL_LIBS} -lclang"
-      ],
-      [have_clang="no"])
-fi
-
-if test "${have_clang}" = "no"; then
-   AC_MSG_WARN([Could not find a usable libclang. Please install libclang to enable syntax highlighting features.])
-fi
-CLANG_INCLUDE=`clang -E - -v < /dev/null 2>&1 | grep "^ /usr" | grep clang`
-AC_SUBST([CLANG_INCLUDE])
-
-AC_CONFIG_FILES([
-Makefile
-data/Makefile
-data/images/Makefile
-data/desktop/Makefile
-data/desktop/edi.desktop
-data/themes/Makefile
-data/themes/default/Makefile
-data/extra/Makefile
-data/extra/skeleton/Makefile
-doc/Makefile
-packaging/Makefile
-packaging/pkgbuild/Makefile
-po/Makefile.in
-src/Makefile
-src/bin/Makefile
-src/lib/Makefile
-src/tests/Makefile
-elm_code/Makefile
-elm_code/data/Makefile
-elm_code/data/themes/Makefile
-elm_code/data/themes/default/Makefile
-elm_code/src/Makefile
-elm_code/src/lib/Makefile
-elm_code/src/lib/widget/Makefile
-elm_code/src/bin/Makefile
-elm_code/src/tests/Makefile
-doc/edi.1
-])
-AC_OUTPUT
-
-echo
-echo
-echo "------------------------------------------------------------------------"
-echo "$PACKAGE_NAME $PACKAGE_VERSION"
-echo "------------------------------------------------------------------------"
-echo
-echo "Compilation..............: make (or gmake)"
-echo "  CPPFLAGS...............: $CPPFLAGS"
-echo "  CFLAGS.................: $CFLAGS"
-echo "  LDFLAGS................: $LDFLAGS"
-echo "  edje_cc................: ${edje_cc}"
-echo "  highlighting (libclang): ${have_clang}"
-echo
-echo "eolian_gen...............: ${eolian_gen}"
-echo
-echo "Building documentation...: ${build_doc}"
-echo "Building tests...........: ${have_tests}"
-echo "Generate coverage .......: ${have_lcov}"
-echo
-echo "Installation.............: make install (as root if needed, with 'su' or 'sudo')"
-echo "  prefix.................: $prefix"
-echo

data/Makefile.am

@@ -1,4 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = themes desktop images extra
-

data/desktop/Makefile.am

@@ -1,9 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-desktopdir = $(datadir)/applications
-desktop_DATA = edi.desktop
-
-icondir = $(datadir)/icons
-icon_DATA = edi.png
-
-EXTRA_DIST = $(desktop_DATA) $(icon_DATA)

data/desktop/edi.desktop.in

@@ -10,3 +10,4 @@ Icon=@PACKAGE_NAME@
 TryExec=@PACKAGE_NAME@
 Exec=@PACKAGE_NAME@
 Categories=Development;Utility;
+MimeType=text/plain;

data/desktop/meson.build

@@ -0,0 +1,14 @@
+desktop_config = configuration_data()
+desktop_config.set('VERSION', meson.project_version())
+desktop_config.set('PACKAGE_NAME', meson.project_name())
+
+configure_file(
+  input : 'edi.desktop.in',
+  output : 'edi.desktop',
+  install_dir : join_paths(get_option('prefix'), 'share/applications/'),
+  configuration : desktop_config
+)
+
+install_data(['edi.png'],
+             install_dir: join_paths(get_option('prefix'), 'share/icons/hicolor/256x256/apps')
+)

data/extra/Makefile.am

@@ -1,4 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = skeleton
-

data/extra/examples/examples.edc

@@ -0,0 +1,133 @@
+collections {
+    group {
+        name: "hellogui";
+        max: 128 128;
+
+        data {
+            item: "title" "C EFL Hello World";
+            item: "path" "tutorial/c/hello-gui/";
+            item: "description"
+                  "Hello World using the EFL unified APIs";
+        }
+
+        parts {
+            part { name: "icon";
+                description { state: "default" 0.0;
+                    max: 128 128;
+                    images.image: "hellogui.png" COMP;
+                    image.normal: "hellogui.png";
+                }
+            }
+        }
+    }
+
+    group {
+        name: "life";
+        max: 128 128;
+
+        data {
+            item: "title" "C EFL Game of Life";
+            item: "path" "apps/c/life/";
+            item: "description"
+                  "Game of Life using the EFL unified APIs.";
+        }
+
+        parts {
+            part { name: "icon";
+                description { state: "default" 0.0;
+                    max: 128 128;
+                    images.image: "life.png" COMP;
+                    image.normal: "life.png";
+                }
+            }
+        }
+    }
+
+    group {
+        name: "texteditor";
+        max: 128 128;
+
+        data {
+            item: "title" "C EFL Basic Text Editor";
+            item: "path" "apps/c/texteditor/";
+            item: "description"
+                  "A basic text editor app using the EFL unified APIs.";
+        }
+
+        parts {
+            part { name: "icon";
+                description { state: "default" 0.0;
+                    max: 128 128;
+                    images.image: "texteditor.png" COMP;
+                    image.normal: "texteditor.png";
+                }
+            }
+        }
+    }
+
+    group {
+        name: "life_csharp";
+        max: 128 128;
+
+        data {
+            item: "title" "C# EFL Game of Life";
+            item: "path" "apps/csharp/life/";
+            item: "description"
+                  "Game of Life using the EFL C# APIs.";
+        }
+
+        parts {
+            part { name: "icon";
+                description { state: "default" 0.0;
+                    max: 128 128;
+                    images.image: "mono-runtime.png" COMP;
+                    image.normal: "mono-runtime.png";
+                }
+            }
+        }
+    }
+
+    group {
+        name: "calculator_csharp";
+        max: 128 128;
+
+        data {
+            item: "title" "C# EFL Calculator";
+            item: "path" "apps/csharp/calculator/";
+            item: "description"
+                  "Calculator using the EFL C# APIs.";
+        }
+
+        parts {
+            part { name: "icon";
+                description { state: "default" 0.0;
+                    max: 128 128;
+                    images.image: "mono-runtime.png" COMP;
+                    image.normal: "mono-runtime.png";
+                }
+            }
+        }
+    }
+
+    group {
+        name: "texteditor_csharp";
+        max: 128 128;
+
+        data {
+            item: "title" "C# Text Editor";
+            item: "path" "apps/csharp/texteditor/";
+            item: "description"
+                  "A basic text editor using the EFL C# APIs.";
+        }
+
+        parts {
+            part { name: "icon";
+                description { state: "default" 0.0;
+                    max: 128 128;
+                    images.image: "mono-runtime.png" COMP;
+                    image.normal: "mono-runtime.png";
+                }
+            }
+        }
+    }
+}

data/extra/examples/meson.build

@@ -0,0 +1,20 @@
+tar = find_program('tar')
+edje_cc = find_program('edje_cc')
+
+cmd = [ edje_cc,
+        '-id', join_paths(meson.source_root(), 'data' , 'extra', 'examples', 'images'),
+        '@INPUT@', '@OUTPUT@'
+      ]
+
+examples_dir = join_paths(get_option('datadir'), 'edi', 'examples')
+custom_target('examples_meta',
+    input   : 'examples.edc',
+    output  : 'examples.edj',
+    command : cmd,
+    install_dir: examples_dir,
+    install: true,
+)
+
+out = join_paths(get_option('prefix'), examples_dir, 'examples.edj')
+meson.add_install_script('../../../scripts/world_read.sh', out)
+

data/extra/skeleton/Makefile.am

@@ -1,9 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-skeletondir = $(datadir)/$(PACKAGE)/skeleton
-skeleton_DATA = eflproject.tar.gz
-
-eflproject.tar.gz:
-	tar zcvf eflproject.tar.gz -C $(srcdir) eflproject
-
-EXTRA_DIST = $(skeleton_DATA)

data/extra/skeleton/eflproject/INSTALL

@@ -1,370 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
-
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
-
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
-
-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.

data/extra/skeleton/eflproject/Makefile.am

@@ -1,91 +0,0 @@
-MAINTAINERCLEANFILES = \
-	ABOUT-NLS \
-	Makefile.in \
-	aclocal.m4 \
-	compile \
-	config.guess \
-	config.h.in \
-	config.rpath \
-	config.sub \
-	configure \
-	depcomp \
-	install-sh \
-	ltmain.sh \
-	missing \
-	m4/libtool.m4 \
-	m4/ltoptions.m4 \
-	m4/ltsugar.m4 \
-	m4/ltversion.m4 \
-	m4/lt~obsolete.m4 \
-	po/boldquot.sed \
-	po/en@boldquot.header \
-	po/en@quot.header \
-	po/insert-header.sin \
-	po/Makefile.in.in \
-	po/Makevars.template \
-	po/quot.sed \
-	po/remove-potcdate.sin \
-	po/Rules-quot \
-	$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
-	$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
-
-SUBDIRS = data doc packaging po src
-
-ACLOCAL_AMFLAGS = -I m4
-
-filesdir = $(docdir)
-files_DATA = \
-	AUTHORS \
-	COPYING \
-	ChangeLog \
-	INSTALL \
-	NEWS \
-	README \
-	TODO
-
-EXTRA_DIST = \
-	autogen.sh \
-	config.rpath \
-	configure \
-	m4/efl_attribute.m4 \
-	m4/efl_binary.m4 \
-	m4/efl_compiler_flag.m4 \
-	m4/efl_path_max.m4
-
-if EFL_HAVE_LCOV
-
-lcov-reset:
-	@rm -rf $(top_builddir)/coverage
-	@find $(top_builddir) -name "*.gcda" -delete
-	@lcov --zerocounters --directory $(top_builddir)
-
-lcov-report:
-	@mkdir $(top_builddir)/coverage
-	lcov --capture --compat-libtool --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir)/src/lib --base-directory $(top_srcdir)/src/lib
-	lcov --remove $(top_builddir)/coverage/coverage.info '*.h' --output-file $(top_builddir)/coverage/coverage.cleaned.info
-	lcov --remove $(top_builddir)/coverage/coverage.cleaned.info '*/tests/*' --output-file $(top_builddir)/coverage/coverage.cleaned2.info
-	genhtml --branch-coverage -t "$(PACKAGE_STRING)" -o $(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned2.info
-	@echo "Coverage Report at $(top_builddir)/coverage/html"
-
-endif
-
-if EFL_HAVE_TESTS
-
-TESTS = src/tests/${edi_name}_tests
-
-lcov-check:
-if EFL_HAVE_LCOV
-	@$(MAKE) $(AM_MAKEFLAGS) lcov-reset
-endif
-	@$(MAKE) $(AM_MAKEFLAGS) check
-if EFL_HAVE_LCOV
-	@$(MAKE) $(AM_MAKEFLAGS) lcov-report
-endif
-
-endif
-
-# cleaning
-
-clean-local:
-	rm -rf benchmark coverage
-

data/extra/skeleton/eflproject/Makefile_Edje_Helper.am

@@ -1,9 +0,0 @@
-EDJE_CC = @edje_cc@
-EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
-EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
-EDJE_CC_FLAGS_VERBOSE_1 = -v
-EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -fastdecomp -id $(srcdir) -fd $(srcdir)
-
-AM_V_EDJ = $(am__v_EDJ_@AM_V@)
-am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
-am__v_EDJ_0 = @echo "  EDJ   " $@;

data/extra/skeleton/eflproject/autogen.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-rm -rf autom4te.cache
-rm -f aclocal.m4 ltmain.sh
-
-echo "Running autopoint..." ; autopoint -f || :
-echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1
-echo "Running autoconf..." ; autoconf || exit 1
-echo "Running autoheader..." ; autoheader || exit 1
-echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
-echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
-
-if [ -z "$NOCONFIGURE" ]; then
-  ./configure "$@"
-fi

data/extra/skeleton/eflproject/configure.ac

@@ -1,98 +0,0 @@
-EFL_VERSION([0], [0], [1], [dev])
-AC_INIT([${edi_name}], [efl_version], [enlightenment-devel@lists.sourceforge.net])
-
-AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([configure.ac])
-AC_CONFIG_HEADERS([config.h])
-
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-
-AM_INIT_AUTOMAKE([1.10 dist-bzip2 -Wall color-tests])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AM_PROG_AR
-
-# this will speed up libtool checks
-LT_PREREQ([2.2])
-LT_INIT([win32-dll pic-only])
-EFL_INIT
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-EFL_ATTRIBUTE_UNUSED
-ELM_QUICKLAUNCH
-EFL_COMPILER_FLAG([-Wall])
-EFL_COMPILER_FLAG([-W])
-
-# Checks for header files.
-EFL_CHECK_PATH_MAX
-
-# Check for EFL
-PKG_CHECK_MODULES([EFL],
-[
- eina >= 1.8.0
- evas >= 1.8.0
- ecore >= 1.8.0
- edje >= 1.8.0
- elementary >= 1.8.0
-])
-
-# Check for tests and coverage
-AC_ARG_WITH([tests],
-   [AC_HELP_STRING([--with-tests=none|regular|coverage],
-                   [choose testing method: regular, coverage or none.
-                    @<:@default=none@:>@])],
-   [build_tests=${withval}],
-   [build_tests=auto])
-
-EFL_TESTS([${build_tests}])
-
-# doxygen program for documentation building
-EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
-
-# Check edje_cc
-EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
-
-# Checks for library functions.
-AC_CHECK_FUNCS([setlocale])
-
-AM_GNU_GETTEXT_VERSION([0.17])
-AM_GNU_GETTEXT([external])
-
-AC_CONFIG_FILES([
-Makefile
-data/Makefile
-data/desktop/Makefile
-data/desktop/${edi_name}.desktop
-data/themes/Makefile
-data/themes/default/Makefile
-doc/Makefile
-packaging/Makefile
-packaging/slackware/Makefile
-packaging/pkgbuild/Makefile
-po/Makefile.in
-src/Makefile
-src/bin/Makefile
-src/lib/Makefile
-src/tests/Makefile
-doc/${edi_name}.1
-])
-AC_OUTPUT
-
-echo
-echo
-echo "------------------------------------------------------------------------"
-echo "$PACKAGE_NAME $PACKAGE_VERSION"
-echo "------------------------------------------------------------------------"
-echo
-echo "Compilation..............: make (or gmake)"
-echo "  CFLAGS.................: $CFLAGS"
-echo "  edje_cc................: ${edje_cc}"
-echo
-echo "Building documentation...: ${build_doc}"
-echo "Building tests...........: ${have_tests}"
-echo "Generate coverage .......: ${have_lcov}"
-echo
-echo "Installation.............: make install (as root if needed, with 'su' or 'sudo')"
-echo "  prefix.................: $prefix"
-echo

data/extra/skeleton/eflproject/data/Makefile.am

@@ -1,3 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = themes desktop

data/extra/skeleton/eflproject/data/desktop/Makefile.am

@@ -1,9 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-desktopdir = $(datadir)/applications
-desktop_DATA = ${edi_name}.desktop
-
-icondir = $(datadir)/icons
-icon_DATA = ${edi_name}.png
-
-EXTRA_DIST = $(desktop_DATA) $(icon_DATA)

data/extra/skeleton/eflproject/data/themes/Makefile.am

@@ -1,4 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = default
-

data/extra/skeleton/eflproject/data/themes/default/Makefile.am

@@ -1,22 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = \
-default.edc \
-images/enlightenment.png \
-sounds/bell.wav
-
-include ../../../Makefile_Edje_Helper.am
-
-filesdir = $(datadir)/$(PACKAGE)/themes
-files_DATA = default.edj
-
-default.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	-id ${top_srcdir}/data/themes/default/images \
-	-sd ${top_srcdir}/data/themes/default/sounds \
-	$(top_srcdir)/data/themes/default/default.edc \
-	$(top_builddir)/data/themes/default/default.edj
-
-clean-local:
-	rm -f *.edj

data/extra/skeleton/eflproject/description

@@ -1 +0,0 @@
-

data/extra/skeleton/eflproject/doc/${edi_name}.1.in

@@ -1,50 +0,0 @@
-.TH ${EDI_NAME} 1 "01 01 ${Edi_Year} FIXME" "@PACKAGE_NAME@ @PACKAGE_VERSION@"
-
-.SH NAME
-${edi_name} \- a demo application
-
-.SH SYNOPSIS
-.B ${edi_name}
-[-L] [-C] [-V] [-h]
-
-.SH DESCRIPTION
-
-${Edi_Name} is a demo application to show how to integrate EFL and autotools into a
-cross platform build. You should be able to generate an executable easily for all
-target supported by EFL with this ${edi_name}.
-
-With no option, the program starts and display an Hello World.
-
-
-.SH OPTIONS
-
-.TP
-.B -L, --license
-Show license.
-
-.TP
-.B -C, --copyright
-Show copyright.
-
-.TP
-.B -V, --version
-Show program version.
-
-.TP
-.B -h, --help
-Print list of options with short description.
-
-
-.SH BUGS
-
-Reports are welcome. Send them at @PACKAGE_BUGREPORT@.
-
-
-.SH HOMEPAGE
-
-http://enlightenment.org
-
-
-.SH AUTHORS
-
-${Edi_User} <${Edi_Email}> and various contributors.

data/extra/skeleton/eflproject/doc/Makefile.am

@@ -1,38 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = ${edi_name}.1.in
-
-man_MANS = ${edi_name}.1
-
-
-.PHONY: doc
-
-PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
-
-if EFL_BUILD_DOC
-
-doc-clean:
-	rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
-
-doc: all
-	$(efl_doxygen)
-	cp $(srcdir)/img/* html/
-	cp $(srcdir)/img/*.eps latex/
-	rm -rf $(PACKAGE_DOCNAME).tar*
-	mkdir -p $(PACKAGE_DOCNAME)/doc
-	cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
-	tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
-	bzip2 -9 $(PACKAGE_DOCNAME).tar
-	rm -rf $(PACKAGE_DOCNAME)/
-	mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
-	@echo "Documentation Package: doc/$(PACKAGE_DOCNAME).tar.bz2"
-	@echo "Documentation HTML: doc/html"
-
-clean-local: doc-clean
-
-else
-
-doc:
-	@echo "Documentation not built. Run ./configure --help"
-
-endif
-

data/extra/skeleton/eflproject/m4/efl.m4

@@ -1,123 +0,0 @@
-dnl file to manage modules in efl
-
-dnl EFL_VERSION(major, minor, micro, release)
-dnl This setup EFL version information and should be called BEFORE AC_INIT().
-dnl
-dnl release parameter is 'dev' to use from SVN or libtool -release field.
-dnl It may be empty if not dev (svn/live build) and no -release is to be used.
-dnl
-dnl Examples:
-dnl     EFL_VERSION(1, 7, 99, dev)
-dnl     EFL_VERSION(1, 7, 99, ver-1234)
-dnl This will define couple of m4 symbols:
-dnl     v_maj = given major number (first parameter)
-dnl     v_min = given minor number (second parameter)
-dnl     v_mic = given micro number (third parameter)
-dnl     v_rev = if release, it's 0, otherwise it's dev_version.
-dnl     v_rel = if release, it's -release followed by fourth parameter,
-dnl             otherwise it's empty. (mostly for libtool)
-dnl     efl_version = if release, it's major.minor.micro, otherwise it's
-dnl             major.minor.micro.dev_version
-dnl     dev_version = development version (svn revision).
-dnl     def_build_profile = dev or release based on 'dev' release parameter.
-AC_DEFUN([EFL_VERSION],
-[dnl
-m4_define([v_maj], [$1])dnl
-m4_define([v_min], [$2])dnl
-m4_define([v_mic], [$3])dnl
-m4_define([dev_version], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl
-m4_define([v_rev], m4_if($4, dev, [dev_version], [0]))dnl
-m4_define([v_rel], [])dnl
-m4_define([def_build_profile], m4_if($4, dev, [dev], [release]))dnl
-m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl
-m4_define([efl_version], [v_maj.v_min.v_mic])dnl
-])
-
-dnl EFL_COLOR
-dnl will check if terminal supports color and if color is wanted by user.
-dnl
-dnl Used Variables:
-dnl     WANT_COLOR: if no, forces no color output.
-dnl     TERM: used to check if color should be enabled.
-dnl
-dnl Defined Variables:
-dnl     COLOR_YES: to be used in positive/yes conditions
-dnl     COLOR_NO: to be used in negative/no conditions
-dnl     COLOR_OTHER: to be used to highlight some other condition
-dnl     COLOR_RESET: to reset color
-dnl     want_color: yes or no
-AC_DEFUN([EFL_COLOR],
-[dnl
-case "$TERM" in
-   xterm|xterm-color|xterm-256color|Eterm|aterm|kterm|rxvt*|screen|gnome|interix)
-      want_color="${WANT_COLOR:-yes}"
-      ;;
-   *)
-      want_color="no"
-      ;;
-esac
-
-if test "${want_color}" = "yes"; then
-   if test `echo -e x` = x; then
-      echoopt=-e
-   else
-      echoopt=
-   fi
-
-   COLOR_YES=`echo $echoopt "\033@<:@1;32m"`
-   COLOR_NO=`echo $echoopt "\033@<:@1;31m"`
-   COLOR_OTHER=`echo $echoopt "\033@<:@1;36m"`
-   COLOR_RESET=`echo $echoopt "\033@<:@0m"`
-
-else
-   COLOR_YES=""
-   COLOR_NO=""
-   COLOR_OTHER=""
-   COLOR_RESET=""
-fi
-])
-
-dnl EFL_INIT()
-dnl Will AC_DEFINE() the following:
-dnl     VMAJ = v_maj
-dnl     VMIN = v_min
-dnl     VMIC = v_mic
-dnl     VREV = v_rev
-dnl Will AC_SUBST() the following:
-dnl     VMAJ = v_maj
-dnl     VMIN = v_min
-dnl     VMIC = v_mic
-dnl     EFL_LTLIBRARY_FLAGS="-no-undefined -version-info ..."
-dnl     EFL_LTMODULE_FLAGS="-no-undefined -avoid-version"
-dnl Will define the following m4:
-dnl     lt_cur = libtool 'current' field of libtool's -version-info
-dnl     lt_rev = libtool 'revision' field of libtool's -version-info
-dnl     lt_age = libtool 'age' field of libtool's -version-info
-AC_DEFUN([EFL_INIT],
-[dnl
-AC_REQUIRE([EFL_COLOR])dnl
-AC_DEFINE_UNQUOTED([VMAJ], [v_maj], [Major version])dnl
-AC_DEFINE_UNQUOTED([VMIN], [v_min], [Minor version])dnl
-AC_DEFINE_UNQUOTED([VMIC], [v_mic], [Micro version])dnl
-AC_DEFINE_UNQUOTED([VREV], [v_rev], [Revison])dnl
-VMAJ=v_maj
-VMIN=v_min
-VMIC=v_mic
-AC_SUBST([VMAJ])dnl
-AC_SUBST([VMIN])dnl
-AC_SUBST([VMIC])dnl
-dnl
-dnl TODO: warning - lt_cur:
-dnl the previous code assumed v_maj + v_min, but this will be a problem when
-dnl we bump v_maj and reset v_min. 1 + 7 == 7 + 1, so if v_maj is bumped
-dnl we multiply it by 100.
-m4_define([lt_cur], m4_if(m4_cmp(v_maj, 1), 0, m4_eval(v_maj + v_min), m4_eval(v_maj * 100 + v_min)))dnl
-m4_define([lt_rev], v_mic)dnl
-m4_define([lt_age], v_min)dnl
-dnl
-EFL_LTLIBRARY_FLAGS="-no-undefined -version-info lt_cur:lt_rev:lt_age v_rel"
-AC_SUBST(EFL_LTLIBRARY_FLAGS)dnl
-EFL_LTMODULE_FLAGS="-no-undefined -avoid-version"
-AC_SUBST([EFL_LTMODULE_FLAGS])dnl
-AC_MSG_NOTICE([Initialized AC_PACKAGE_NAME (AC_PACKAGE_VERSION) development=dev_version v_rel])
-])

data/extra/skeleton/eflproject/m4/efl_attribute.m4

@@ -1,56 +0,0 @@
-dnl Copyright (C) 2011 Vincent Torri <vtorri at univ-evry dot fr>
-dnl That code is public domain and can be freely used or copied.
-
-dnl Macros for checking if the compiler supports some __attribute__ uses
-
-dnl Usage: EFL_ATTRIBUTE_UNUSED
-dnl call AC_DEFINE for __UNUSED__ if __attribute__((unused)) is available
-
-AC_DEFUN([EFL_ATTRIBUTE_UNUSED],
-[
-AC_MSG_CHECKING([for __attribute__ ((unused))])
-AC_COMPILE_IFELSE(
-   [AC_LANG_PROGRAM(
-       [[
-void foo(int x __attribute__ ((unused))) {}
-       ]],
-       [[
-       ]])],
-   [have_attribute_unused="yes"],
-   [have_attribute_unused="no"])
-AC_MSG_RESULT([${have_attribute_unused}])
-
-if test "x${have_attribute_unused}" = "xyes" ; then
-   AC_DEFINE([__UNUSED__], [__attribute__ ((unused))], [Macro declaring a function argument to be unused.])
-else
-   AC_DEFINE([__UNUSED__], [], [__attribute__ ((unused)) is not supported.])
-fi
-])
-
-dnl Usage: EFL_ATTRIBUTE_VECTOR
-dnl call AC_DEFINE for HAVE_GCC_ATTRIBUTE_VECTOR if __attribute__((vector)) is available
-
-AC_DEFUN([EFL_ATTRIBUTE_VECTOR],
-[
-AC_MSG_CHECKING([for __attribute__ ((vector))])
-AC_COMPILE_IFELSE(
-   [AC_LANG_PROGRAM(
-       [[
-typedef int v4si __attribute__ ((vector_size (16)));
-       ]],
-       [[
-if (sizeof(v4si) == 16)
-  return 0;
-else
-  return -1;
-       ]])],
-   [have_attribute_vector="yes"],
-   [have_attribute_vector="no"])
-AC_MSG_RESULT([${have_attribute_vector}])
-
-if test "x${have_attribute_vector}" = "xyes" ; then
-   AC_DEFINE([HAVE_GCC_ATTRIBUTE_VECTOR], [1], [Define to 1 if your compiler supports __attribute__ ((vector)).])
-fi
-])
-
-dnl End of efl_attribute.m4

data/extra/skeleton/eflproject/m4/efl_binary.m4

@@ -1,79 +0,0 @@
-dnl Copyright (C) 2010 Vincent Torri <vtorri at univ-evry dot fr>
-dnl That code is public domain and can be freely used or copied.
-
-dnl Macro that check if a binary is built or not
-
-dnl Usage: EFL_ENABLE_BIN(binary)
-dnl Call AC_SUBST(BINARY_PRG) (BINARY is the uppercase of binary, - being transformed into _)
-dnl Define have_binary (- is transformed into _)
-dnl Define conditional BUILD_BINARY (BINARY is the uppercase of binary, - being transformed into _)
-
-AC_DEFUN([EFL_ENABLE_BIN],
-[
-
-m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl
-m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl
-
-have_[]m4_defn([DOWN])="yes"
-
-dnl configure option
-
-AC_ARG_ENABLE([$1],
-   [AC_HELP_STRING([--disable-$1], [disable building of ]DOWN)],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       have_[]m4_defn([DOWN])="yes"
-    else
-       have_[]m4_defn([DOWN])="no"
-    fi
-   ])
-
-AC_MSG_CHECKING([whether to build ]DOWN[ binary])
-AC_MSG_RESULT([$have_[]m4_defn([DOWN])])
-
-if test "x$have_[]m4_defn([DOWN])" = "xyes"; then
-   UP[]_PRG=DOWN[${EXEEXT}]
-fi
-
-AC_SUBST(UP[]_PRG)
-
-AM_CONDITIONAL(BUILD_[]UP, test "x$have_[]m4_defn([DOWN])" = "xyes")
-
-AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$2], [$3])
-
-])
-
-
-dnl Macro that check if a binary is built or not
-
-dnl Usage: EFL_WITH_BIN(package, binary, default_value)
-dnl Call AC_SUBST(_binary) (_binary is the lowercase of binary, - being transformed into _ by default, or the value set by the user)
-
-AC_DEFUN([EFL_WITH_BIN],
-[
-
-m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl
-m4_pushdef([UP], m4_translit([[$2]], [-a-z], [_A-Z]))dnl
-
-dnl configure option
-
-AC_ARG_WITH([$2],
-   [AC_HELP_STRING([--with-$2=PATH], [specify a specific path to ]DOWN[ @<:@default=$3@:>@])],
-   [
-    _efl_with_binary=${withval}
-    _efl_binary_define="yes"
-   ],
-   [
-    _efl_with_binary=$(pkg-config --variable=prefix $1)/bin/$3
-    _efl_binary_define="no"
-   ])
-
-DOWN=${_efl_with_binary}
-AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
-
-with_binary_[]m4_defn([DOWN])=${_efl_with_binary}
-
-AM_CONDITIONAL(HAVE_[]UP, [test "x${_efl_binary_define}" = "xyes"])
-AC_SUBST(DOWN)
-
-])

data/extra/skeleton/eflproject/m4/efl_compiler_flag.m4

@@ -1,57 +0,0 @@
-dnl Copyright (C) 2010 Vincent Torri <vtorri at univ-evry dot fr>
-dnl                and Albin Tonnerre <albin dot tonnerre at gmail dot com>
-dnl That code is public domain and can be freely used or copied.
-
-dnl Macro that checks if a compiler flag is supported by the compiler.
-
-dnl Usage: EFL_COMPILER_FLAG(flag)
-dnl flag is added to CFLAGS if supported.
-
-AC_DEFUN([EFL_COMPILER_FLAG],
-[
-
-CFLAGS_save="${CFLAGS}"
-CFLAGS="${CFLAGS} $1"
-  
-AC_LANG_PUSH([C])
-AC_MSG_CHECKING([whether the compiler supports $1])
-
-AC_COMPILE_IFELSE(
-   [AC_LANG_PROGRAM([[]])],
-   [have_flag="yes"],
-   [have_flag="no"])
-AC_MSG_RESULT([${have_flag}])
-
-if test "x${have_flag}" = "xno" ; then
-   CFLAGS="${CFLAGS_save}"
-fi
-AC_LANG_POP([C])
-
-])
-
-dnl Macro that checks if a linker flag is supported by the compiler.
-
-dnl Usage: EFL_LINKER_FLAG(flag)
-dnl flag is added to LDFLAGS if supported (will be passed to ld anyway).
-
-AC_DEFUN([EFL_LINKER_FLAG],
-[
-
-LDFLAGS_save="${LDFLAGS}"
-LDFLAGS="${LDFLAGS} $1"
-  
-AC_LANG_PUSH([C])
-AC_MSG_CHECKING([whether the compiler supports $1])
-
-AC_LINK_IFELSE(
-   [AC_LANG_PROGRAM([[]])],
-   [have_flag="yes"],
-   [have_flag="no"])
-AC_MSG_RESULT([${have_flag}])
-
-if test "x${have_flag}" = "xno" ; then
-   LDFLAGS="${LDFLAGS_save}"
-fi
-AC_LANG_POP([C])
-
-])

data/extra/skeleton/eflproject/m4/efl_doxygen.m4

@@ -1,98 +0,0 @@
-dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr>
-dnl That code is public domain and can be freely used or copied.
-
-dnl Macro that check if doxygen is available or not.
-
-dnl EFL_CHECK_DOXYGEN([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for the doxygen program
-dnl Defines efl_doxygen
-dnl Defines the automake conditionnal EFL_BUILD_DOC
-dnl
-AC_DEFUN([EFL_CHECK_DOXYGEN],
-[
-
-dnl
-dnl Disable the build of the documentation
-dnl
-AC_ARG_ENABLE([doc],
-   [AC_HELP_STRING(
-       [--disable-doc],
-       [Disable documentation build @<:@default=enabled@:>@])],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       efl_enable_doc="yes"
-    else
-       efl_enable_doc="no"
-    fi
-   ],
-   [efl_enable_doc="yes"]
-)
-
-if test "x${efl_enable_doc}" = "xyes" ; then
-
-dnl
-dnl Specify the full file name, with path
-dnl
-
-   efl_doxygen="doxygen"
-
-   AC_ARG_WITH([doxygen],
-      [AC_HELP_STRING(
-          [--with-doxygen=FILE],
-          [doxygen program to use @<:@default=doxygen@:>@])],
-dnl
-dnl Check the given doxygen program.
-dnl
-      [efl_doxygen=${withval}
-       AC_CHECK_PROG([efl_have_doxygen],
-          [${efl_doxygen}],
-          [yes],
-          [no])
-       if test "x${efl_have_doxygen}" = "xno" ; then
-          echo "WARNING:"
-          echo "The doxygen program you specified:"
-          echo "$efl_doxygen"
-          echo "was not found.  Please check the path and make sure "
-          echo "the program exists and is executable."
-          AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
-       fi
-      ],
-      [AC_CHECK_PROG([efl_have_doxygen],
-          [${efl_doxygen}],
-          [yes],
-          [no])
-       if test "x${efl_have_doxygen}" = "xno" ; then
-          echo "WARNING:"
-          echo "The doxygen program was not found in your execute"
-          echo "You may have doxygen installed somewhere not covered by your path."
-          echo ""
-          echo "If this is the case make sure you have the packages installed, AND"
-          echo "that the doxygen program is in your execute path (see your"
-          echo "shell manual page on setting the \$PATH environment variable), OR"
-          echo "alternatively, specify the program to use with --with-doxygen."
-          AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
-       fi
-      ]
-   )
-fi
-
-dnl
-dnl Substitution
-dnl
-AC_SUBST([efl_doxygen])
-
-if ! test "x${efl_have_doxygen}" = "xyes" ; then
-   efl_enable_doc="no"
-fi
-
-AM_CONDITIONAL(EFL_BUILD_DOC, test "x${efl_enable_doc}" = "xyes")
-
-if test "x${efl_enable_doc}" = "xyes" ; then
-  ifelse([$1], , :, [$1])
-else
-  ifelse([$2], , :, [$2])
-fi
-
-])
-
-dnl End of doxygen.m4

data/extra/skeleton/eflproject/m4/efl_path_max.m4

@@ -1,36 +0,0 @@
-dnl Check for PATH_MAX in limits.h, and define a default value if not found
-dnl This is a workaround for systems not providing PATH_MAX, like GNU/Hurd
-
-dnl EFL_CHECK_PATH_MAX([DEFAULT_VALUE_IF_NOT_FOUND])
-dnl
-dnl If PATH_MAX is not defined in <limits.h>, defines it
-dnl to DEFAULT_VALUE_IF_NOT_FOUND if it exists, or fallback
-dnl to using 4096
-
-AC_DEFUN([EFL_CHECK_PATH_MAX],
-[
-
-default_max=m4_default([$1], "4096")
-AC_LANG_PUSH([C])
-
-AC_MSG_CHECKING([for PATH_MAX in limits.h])
-AC_COMPILE_IFELSE(
-   [AC_LANG_PROGRAM(
-       [[
-#include <limits.h>
-       ]],
-       [[
-int i = PATH_MAX;
-       ]])],
-   [AC_MSG_RESULT([yes])],
-   [
-    AC_DEFINE_UNQUOTED([PATH_MAX],
-       [${default_max}],
-       [default value since PATH_MAX is not defined])
-    AC_MSG_RESULT([no: using ${default_max}])
-   ])
-
-AC_LANG_POP([C])
-
-])
-dnl end of efl_path_max.m4

data/extra/skeleton/eflproject/m4/efl_tests.m4

@@ -1,65 +0,0 @@
-dnl Copyright (C) 2013 Cedric BAIL <cedric.bail at free dot fr>
-dnl That code is public domain and can be freely used or copied.
-
-dnl Macro for checking availability of tests and coverage infra structure
-
-dnl Usage: EFL_TESTS(profile)
-dnl Valid profile are auto, tests, coverage, no
-dnl Call PKG_CHECK_MODULES, AC_CHECK_PROG, define CHECK_CFLAGS/CHECK_LIBS and modify CFLAGS/LIBS
-dnl It define EFL_HAVE_TESTS/EFL_HAVE_LCOV for use in Makefile.am
-dnl It set have_test and have_coverage to yes/no depending if found
-
-AC_DEFUN([EFL_TESTS],
-[
-build_tests=$1
-
-case "${build_tests}" in
-     auto)
-	check_tests="auto"
-	check_coverage="auto"
-	;;
-     tests)
-	check_tests="yes"
-	check_coverage="auto"
-	;;
-     coverage)
-	check_tests="yes"
-	check_coverage="yes"
-        ;;
-     no)
-	check_tests="no"
-	check_coverage="no"
-	;;
-     *)
-	AC_MSG_ERROR([Unknow tests profile])
-esac
-
-have_tests="no"
-if test "x${check_tests}" = "xyes" -o "x${check_tests}" = "xauto"; then
-   PKG_CHECK_MODULES([CHECK], [check >= 0.9.5], [have_tests="yes"], [have_tests="no"])
-   if test "${check_tests}" = "xyes" -a "x${have_tests}" = "xno"; then
-      AC_MSG_ERROR([Impossible to find check package to build tests])
-   fi
-fi
-
-if test "x${have_tests}" = "xyes"; then
-   if test "x${check_coverage}" = "xyes" -o "x${check_coverage}" = "xauto"; then
-      AC_CHECK_PROG([have_lcov], [lcov], [yes], [no])
-      if test "x${have_lcov}" = "xyes" ; then
-      	 CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
-	 LIBS="${LIBS} -lgcov"
-      fi
-      if test "x${have_lcov}" = "xno" -a "x${check_coverage}" = "xyes"; then
-      	 AC_MSG_ERROR([Impossible to find lcov package to build with coverage support])
-      fi
-   else
-      have_coverage="no"
-   fi
-else
-   have_coverage="no"
-fi
-
-AM_CONDITIONAL([EFL_HAVE_TESTS], [test "x${have_tests}" = "xyes"])
-AM_CONDITIONAL([EFL_HAVE_LCOV], [test "x${have_lcov}" = "xyes"])
-
-])

data/extra/skeleton/eflproject/packaging/Makefile.am

@@ -1,4 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = slackware pkgbuild
-

data/extra/skeleton/eflproject/packaging/pkgbuild/Makefile.am

@@ -1,3 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = PKGBUILD

data/extra/skeleton/eflproject/packaging/pkgbuild/PKGBUILD

@@ -1,60 +0,0 @@
-# Maintainer: Enlightenment Developers <enlightenment-devel@enlightenment.org>
-pkgname=('${edi_name}-git' '${edi_name}_doc-git')
-pkgver=1.8.99.8967.a1cfce6
-pkgrel=1
-pkgdesc="Enlightenment toolkit ${edi_name} - GIT development snapshot"
-arch=('i686' 'x86_64' 'arm')
-url="http://${Edi_Url}"
-license=('WTFPL')
-makedepends=('doxygen' 'imagemagick' 'git')
-depends=('elementary-git')
-optdepends=('emotion_generic_players' 'evas_generic_loaders')
-options=('!libtool' 'debug')
-provides=('${edi_name}')
-
-pkgver() {
-  cd "../.."
-
-  for _i in v_maj v_min v_mic; do
-    local v_ver=$v_ver.$(grep -m 1 $_i configure.ac | sed 's/m4//' | grep -o "[[:digit:]]*")
-  done
-
-  v_ver=$(awk -F , -v v_ver=${v_ver#.} '/^AC_INIT/ {gsub(/v_ver/, v_ver); gsub(/[\[\] -]/, ""); print $2}' configure.ac)
-
-  printf "$v_ver.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
-}
-
-build() {
-  cd "../.."
-  export CFLAGS="$CFLAGS -fvisibility=hidden -fomit-frame-pointer"
-  [[ -e Makefile ]] && make clean distclean
-  ./configure --prefix=/usr \
-  --disable-static
-  make
-  make doc
-}
-
-package_${edi_name}-git() {
-  cd "../.."
-  make -j1 DESTDIR="$pkgdir/" install
-  install -Dm644 README "$pkgdir/usr/share/$pkgname/README"
-  install -Dm644 NEWS "$pkgdir/usr/share/$pkgname/NEWS"
-  install -Dm644 ChangeLog "$pkgdir/usr/share/$pkgname/ChangeLog"
-  install -Dm644 AUTHORS "$pkgdir/usr/share/$pkgname/AUTHORS"
-  install -Dm644 COMPLIANCE "$pkgdir/usr/share/$pkgname/COMPLIANCE"
-  install -Dm644 COPYING.images "$pkgdir/usr/share/licenses/$pkgname/COPYING.images"
-  sed -n '1,/details./p' COPYING > "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-  ln -s "../licenses/$pkgname/COPYING" "$pkgdir/usr/share/$pkgname/COPYING"
-  ln -s "../licenses/$pkgname/COPYING.images" "$pkgdir/usr/share/$pkgname/COPYING.images"
-}
-
-package_${edi_name}_doc-git() {
-  pkgdesc="Documentation for ${Edi_Name}"
-  arch=('any')
-  unset depends optdepends
-
-  cd "../.."
-  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
-  cp -a doc/html "$pkgdir/usr/share/doc/$pkgname/html"
-  cp -a doc/latex "$pkgdir/usr/share/doc/$pkgname/latex"
-}

data/extra/skeleton/eflproject/packaging/slackware/${edi_name}.SlackBuild

@@ -1,106 +0,0 @@
-#!/bin/bash
-#
-# Begin ${edi_name}.SlackBuild
-#
-# Copyright (C) 2012-2013  Jerome Pinot <ngc891@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-NAME=${edi_name}
-BUILD=${BUILD:-1jp}
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=${TMP}/package-${NAME}
-
-# First check if we are in the right folder
-if [ -f ./${NAME}.SlackBuild ]; then
-  echo 'Found SlackBuild'
-else
-  echo 'Error: You must run this script from the packaging/slackware sub-folder!'
-  exit 1
-fi
-
-# Get the version number from configure.ac
-if [ -f ../../configure.ac ];then
-  VERSION=`grep "AC_INIT" ../../configure.ac | cut -d' ' -f2 | sed -e 's/\[//' -e 's/\],//'`
-else
-  echo "Error: can't find configure.ac!"
-  exit 2
-fi
-
-# if ${ARCH} is unset, we have to guess it with uname
-if [ -z "${ARCH}" ]; then
-  case "$(uname -m)" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-    *)    export ARCH=$(uname -m) ;;
-  esac
-fi
-
-# Set generic flags for gcc
-SCFLAGS='-O2'
-if [ "${ARCH}" = "i486" ]; then
-  SCFLAGS="${SCFLAGS} -march=i486 -mtune=i686"
-  LIBDIR="/usr/lib"
-elif [ "${ARCH}" = "x86_64" ]; then
-  SCFLAGS="${SCFLAGS} -fPIC"
-  LIBDIR="/usr/lib64"
-elif [ "${ARCH}" = "arm" ]; then
-  SCFLAGS="${SCFLAGS} -march=armv4 -mtune=xscale"
-  LIBDIR="/usr/lib"
-fi
-
-# Creating directories
-if [ ! -d ${TMP} ]; then
-  mkdir -p ${TMP}
-fi
-rm -rf ${PKG}
-mkdir -p ${PKG}
-
-# Configuring
-cd ../..
-CFLAGS="${SCFLAGS}" \
-  ./configure \
-    --prefix=/usr \
-    --libdir=${LIBDIR} \
-    --mandir=/usr/man \
-    --docdir=/usr/doc/${NAME}-${VERSION}
-
-# Building
-make
-
-# Installing
-make DESTDIR=${PKG} install
-
-# Cleaning
-cd ${PKG}
-gzip -9 usr/man/man1/${NAME}.1
-
-find ${PKG} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-find ${PKG} | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Building the package
-mkdir install
-install -m644 ${CWD}/doinst.sh install/
-install -m644 ${CWD}/slack-desc install/
-install -m644 ${CWD}/slack-required install/
-makepkg -l y -c n ${CWD}/${NAME}-${VERSION}-${ARCH}-${BUILD}.txz
-rm -rf ${PKG}
-
-# End ${edi_name}.SlackBuild

data/extra/skeleton/eflproject/packaging/slackware/Makefile.am

@@ -1,4 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = doinst.sh ${edi_name}.SlackBuild slack-desc slack-required
-

data/extra/skeleton/eflproject/packaging/slackware/doinst.sh

@@ -1 +0,0 @@
-# Stuff done after package installation

data/extra/skeleton/eflproject/packaging/slackware/slack-desc

@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-${edi_name}: ${edi_name}
-${edi_name}:
-${edi_name}: ${Edi_Name} is an example of application written using the Enlightenment
-${edi_name}: Foundation Libraries.
-${edi_name}: 
-${edi_name}: It requires elementary.
-${edi_name}:
-${edi_name}: ${edi_name} was written by ${Edi_User} <${Edi_Email}>
-${edi_name}: website: <http://${Edi_Url}/>
-${edi_name}:
-${edi_name}:

data/extra/skeleton/eflproject/packaging/slackware/slack-required

@@ -1,5 +0,0 @@
-eina >= 1.8.0
-evas >= 1.8.0
-ecore >= 1.8.0
-edje >= 1.8.0
-elementary >= 1.8.0

data/extra/skeleton/eflproject/src/Makefile.am

@@ -1,4 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = lib bin tests
-

data/extra/skeleton/eflproject/src/bin/Makefile.am

@@ -1,19 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-bin_PROGRAMS = ${edi_name}
-
-AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
--I$(top_builddir)/src/bin/ \
--I$(top_srcdir)/src/bin/ \
--I$(top_builddir)/src/lib/ \
--I$(top_srcdir)/src/lib/ \
-@EFL_CFLAGS@
-
-${edi_name}_SOURCES = ${edi_name}_main.c
-${edi_name}_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/lib${edi_name}.la
-
-localedir = $(datadir)/locale
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-EXTRA_DIST = ${edi_name}_private.h
-

data/extra/skeleton/eflproject/src/lib/${Edi_Name}.h

@@ -1,111 +0,0 @@
-#ifndef ${EDI_NAME}_H_
-# define ${EDI_NAME}_H_
-
-#include <Elementary.h>
-
-#ifdef EAPI
-# undef EAPI
-#endif
-
-#ifdef _WIN32
-# ifdef EFL_${EDI_NAME}_BUILD
-#  ifdef DLL_EXPORT
-#   define EAPI __declspec(dllexport)
-#  else
-#   define EAPI
-#  endif /* ! DLL_EXPORT */
-# else
-#  define EAPI __declspec(dllimport)
-# endif /* ! EFL_${EDI_NAME}_BUILD */
-#else
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
-#   define EAPI __attribute__ ((visibility("default")))
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI
-# endif
-#endif /* ! _WIN32 */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @file
- * @brief These routines are used for ${Edi_Name} library interaction.
- */
-
-/**
- * @brief Init / shutdown functions.
- * @defgroup Init  Init / Shutdown
- *
- * @{
- *
- * Functions of obligatory usage, handling proper initialization
- * and shutdown routines.
- *
- * Before the usage of any other function, ${Edi_Name} should be properly
- * initialized with @ref ${edi_name}_init() and the last call to ${Edi_Name}'s
- * functions should be @ref ${edi_name}_shutdown(), so everything will
- * be correctly freed.
- *
- * ${Edi_Name} logs everything with Eina Log, using the "${edi_name}" log domain.
- *
- */
-
-/**
- * Initialize ${Edi_Name}.
- *
- * Initializes ${Edi_Name}, its dependencies and modules. Should be the first
- * function of ${Edi_Name} to be called.
- *
- * @return The init counter value.
- *
- * @see ${edi_name}_shutdown().
- *
- * @ingroup Init
- */
-EAPI int ${edi_name}_init(void);
-
-/**
- * Shutdown ${Edi_Name}
- *
- * Shutdown ${Edi_Name}. If init count reaches 0, all the internal structures will
- * be freed. Any ${Edi_Name} library call after this point will leads to an error.
- *
- * @return ${Edi_Name}'s init counter value.
- *
- * @see ${edi_name}_init().
- *
- * @ingroup Init
- */
-EAPI int ${edi_name}_shutdown(void);
-
-/**
- * @}
- */
-
-/**
- * @brief Main group API that wont do anything
- * @defgroup Main Main
- *
- * @{
- *
- * @brief A function that doesn't do any good nor any bad
- *
- * @ingroup Main
- */
-EAPI void ${edi_name}_library_call(void);
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ${EDI_NAME}_H_ */

data/extra/skeleton/eflproject/src/lib/${edi_name}.c

@@ -1,64 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "${Edi_Name}.h"
-
-#include "${edi_name}_private.h"
-
-static int _${edi_name}_init = 0;
-int _${edi_name}_lib_log_dom = -1;
-
-EAPI int
-${edi_name}_init(void)
-{
-   _${edi_name}_init++;
-   if (_${edi_name}_init > 1) return _${edi_name}_init;
-
-   eina_init();
-
-   _${edi_name}_lib_log_dom = eina_log_domain_register("${edi_name}", EINA_COLOR_CYAN);
-   if (_${edi_name}_lib_log_dom < 0)
-     {
-	EINA_LOG_ERR("${Edi_Name} can not create its log domain.");
-	goto shutdown_eina;
-     }
-
-   // Put here your initialization logic of your library
-
-   eina_log_timing(_${edi_name}_lib_log_dom, EINA_LOG_STATE_STOP, EINA_LOG_STATE_INIT);
-
-   return _${edi_name}_init;
-
- shutdown_eina:
-   eina_shutdown();
-   _${edi_name}_init--;
-
-   return _${edi_name}_init;
-}
-
-EAPI int
-${edi_name}_shutdown(void)
-{
-   _${edi_name}_init--;
-   if (_${edi_name}_init != 0) return _${edi_name}_init;
-
-   eina_log_timing(_${edi_name}_lib_log_dom,
-		   EINA_LOG_STATE_START,
-		   EINA_LOG_STATE_SHUTDOWN);
-
-   // Put here your shutdown logic
-
-   eina_log_domain_unregister(_${edi_name}_lib_log_dom);
-   _${edi_name}_lib_log_dom = -1;
-
-   eina_shutdown();
-
-   return _${edi_name}_init;
-}
-
-EAPI void
-${edi_name}_library_call(void)
-{
-   INF("Not really doing anything useful.");
-}

data/extra/skeleton/eflproject/src/lib/${edi_name}_private.h

@@ -1,27 +0,0 @@
-#ifndef ${EDI_NAME}_PRIVATE_H
-# define ${EDI_NAME}_PRIVATE_H
-
-extern int _${edi_name}_lib_log_dom;
-
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_${edi_name}_lib_log_dom, __VA_ARGS__)
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_${edi_name}_lib_log_dom, __VA_ARGS__)
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_${edi_name}_lib_log_dom, __VA_ARGS__)
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_${edi_name}_lib_log_dom, __VA_ARGS__)
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_${edi_name}_lib_log_dom, __VA_ARGS__)
-
-#endif

data/extra/skeleton/eflproject/src/lib/Makefile.am

@@ -1,18 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I$(top_srcdir)/src/lib \
--I$(top_builddir)/src/lib \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EFL_CFLAGS@ \
--DEFL_${EDI_NAME}_BUILD
-
-lib_LTLIBRARIES = lib${edi_name}.la
-
-includes_HEADERS = ${Edi_Name}.h
-includesdir = $(includedir)/${edi_name}-@VMAJ@
-
-lib${edi_name}_la_SOURCES = ${edi_name}.c
-lib${edi_name}_la_LIBADD = @EFL_LIBS@ -lm
-lib${edi_name}_la_LDFLAGS = -no-undefined @EFL_LTLIBRARY_FLAGS@

data/extra/skeleton/eflproject/src/tests/Makefile.am

@@ -1,17 +0,0 @@
-
-if EFL_HAVE_TESTS
-
-check_PROGRAMS = ${edi_name}_tests
-
-${edi_name}_tests_SOURCES = test_${edi_name}.c
-${edi_name}_tests_CPPFLAGS = -I$(top_builddir)/src/lib/ \
--DPACKAGE_TESTS_DIR=\"$(top_srcdir)/src/tests/\" \
--DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/\" \
-@EFL_CFLAGS@ \
-@CHECK_CFLAGS@
-${edi_name}_tests_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/lib${edi_name}.la
-${edi_name}_tests_DEPENDENCIES = $(top_builddir)/src/lib/lib${edi_name}.la
-
-endif
-
-EXTRA_DIST = test_${edi_name}.c

data/extra/skeleton/eflproject/src/tests/test_${edi_name}.c

@@ -1,124 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <Ecore_Getopt.h>
-#include <check.h>
-
-#include "${Edi_Name}.h"
-
-#define COPYRIGHT "Copyright © ${Edi_Year} ${Edi_User} <${Edi_Email}> and various contributors (see AUTHORS)."
-
-static void ${edi_name}_test_basic(TCase *tc);
-
-static const struct {
-   const char *name;
-   void (*build)(TCase *tc);
-} tests[] = {
-  { "basic", ${edi_name}_test_basic }
-};
-
-START_TEST(${edi_name}_initialization)
-{
-   fail_if(${edi_name}_init() != 1);
-
-   ${edi_name}_library_call();
-
-   fail_if(${edi_name}_shutdown() != 0);
-}
-END_TEST
-
-static void
-${edi_name}_test_basic(TCase *tc)
-{
-   tcase_add_test(tc, ${edi_name}_initialization);
-}
-
-static const Ecore_Getopt optdesc = {
-  "${edi_name}",
-  "%prog [options]",
-  PACKAGE_VERSION,
-  COPYRIGHT,
-  "BSD with advertisement clause",
-  "An EFL ${edi_name} program",
-  0,
-  {
-    ECORE_GETOPT_STORE_TRUE('l', "list", "list available tests"),
-    ECORE_GETOPT_STORE_STR('t', "test", "test to run"),
-    ECORE_GETOPT_LICENSE('L', "license"),
-    ECORE_GETOPT_COPYRIGHT('C', "copyright"),
-    ECORE_GETOPT_VERSION('V', "version"),
-    ECORE_GETOPT_HELP('h', "help"),
-    ECORE_GETOPT_SENTINEL
-  }
-};
-
-int
-main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
-{
-   Suite *s;
-   SRunner *sr;
-   TCase *tc = NULL;
-   char *test = NULL;
-   unsigned int i;
-   int failed_count = -1;
-   int args;
-   Eina_Bool quit_option = EINA_FALSE;
-   Eina_Bool list_option = EINA_FALSE;
-
-   Ecore_Getopt_Value values[] = {
-     ECORE_GETOPT_VALUE_BOOL(list_option),
-     ECORE_GETOPT_VALUE_STR(test),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_NONE
-   };
-
-   eina_init();
-
-   args = ecore_getopt_parse(&optdesc, values, argc, argv);
-   if (args < 0)
-     {
-	EINA_LOG_CRIT("Could not parse arguments.");
-	goto end;
-     }
-   else if (quit_option)
-     {
-	goto end;
-     }
-   else if (list_option)
-     {
-	fprintf(stdout, "Available tests :\n");
-	for (i = 0; i < sizeof (tests) / sizeof (tests[0]); i++)
-	  fprintf(stdout, "\t%s\n", tests[i].name);
-	goto end;
-     }
-
-   s = suite_create("${Edi_Name}");
-
-   for (i = 0; i < sizeof (tests) / sizeof (tests[0]); i++)
-     {
-	if (test && strcmp(tests[i].name, test))
-	  continue ;
-
-	tc =  tcase_create(tests[i].name);
-	tcase_set_timeout(tc, 0);
-
-	tests[i].build(tc);
-	suite_add_tcase(s, tc);
-     }
-
-   sr = srunner_create(s);
-   srunner_set_xml(sr, PACKAGE_BUILD_DIR "/check-results.xml");
-
-   srunner_run_all(sr, CK_ENV);
-   failed_count = srunner_ntests_failed(sr);
-   srunner_free(sr);
-
- end:
-   eina_shutdown();
-
-   return (failed_count == 0) ? 0 : 255;
-}

data/extra/templates/meson.build

@@ -0,0 +1,34 @@
+tar = find_program('tar')
+edje_cc = find_program('edje_cc')
+
+skeleton_names = ['eflproject', 'eflproject_python']
+
+foreach skeleton_name : skeleton_names
+
+  custom_target('skeleton ' + skeleton_name,
+    command : [tar, 'zcf', '@OUTPUT@', '-C',
+      join_paths(meson.source_root(), 'data', 'extra', 'templates', 'skeletons'),
+      skeleton_name],
+    output : skeleton_name + '.tar.gz',
+    install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'edi', 'templates'),
+    install : true,
+  )
+
+endforeach
+
+cmd = [ edje_cc,
+        '-id', join_paths(meson.source_root(), 'data' , 'extra', 'templates', 'images'),
+        '@INPUT@', '@OUTPUT@'
+      ]
+
+template_dir = join_paths(get_option('datadir'), 'edi', 'templates')
+custom_target('templates_meta',
+    input   : 'templates.edc',
+    output  : 'templates.edj',
+    command : cmd,
+    install_dir: template_dir,
+    install: true,
+)
+out = join_paths(get_option('prefix'), template_dir, 'templates.edj')
+meson.add_install_script('../../../scripts/world_read.sh', out)
+

data/extra/templates/skeletons/eflproject/.gitignore

@@ -8,6 +8,7 @@
 .deps
 *.gcno
 *.gcda
+.edi
 
 /src/bin/${edi_name}
 /src/tests/${edi_name}_tests
@@ -57,6 +58,9 @@ po/remove-potcdate.sed
 po/remove-potcdate.sin
 po/stamp-po
 
+doc/${edi_name}.1
+data/desktop/${edi_name}.desktop
+
 /coverage/
 /src/tests/${edi_name}_tests.*
 /src/tests/test-suite.log

data/extra/templates/skeletons/eflproject/COPYING

@@ -0,0 +1,28 @@
+Copyright (c) ${Edi_Year} ${Edi_User}
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/extra/templates/skeletons/eflproject/ChangeLog

@@ -0,0 +1 @@
+ChangeLog

data/extra/templates/skeletons/eflproject/INSTALL

@@ -0,0 +1,60 @@
+** COMPILING and INSTALLING **
+------------------------------
+
+Meson is the build system used for this project. For more information please
+see:
+
+    http://mesonbuild.com
+
+----
+
+Normal compilation in /usr/local:
+
+    meson . build
+    ninja -C build
+    sudo ninja -C build install
+
+For meson build generic options:
+
+    meson --help
+
+For a list of project specific options supported:
+
+    cat meson_options.txt
+
+To set 1 or more project specific options:
+
+    meson --prefix=/path/to -Doption=value [-Dother=value2] [...] . build
+
+To display current configuration:
+
+    mesonconf build
+
+The above will only work after at least the following is done:
+
+    meson . build
+
+** QUICK AND DIRTY HELP **
+--------------------------
+
+How to clean out the build and config and start fresh:
+
+    rm -rf build
+
+How to make a dist tarball and check its build:
+(must do it from git tree clone and commit all changes to git first)
+
+    ninja -C build dist
+
+How to change prefix:
+
+    meson --prefix=/path/to/prefix . build
+
+How to install in a specific destination directory for packaging:
+
+    DESTDIR=/path/to/destdir ninja -C build install
+
+How to build with verbose output (full commands run):
+
+    ninja -C build -v
+

data/extra/templates/skeletons/eflproject/NEWS

@@ -0,0 +1 @@
+NEWS

data/extra/templates/skeletons/eflproject/README

@@ -0,0 +1 @@
+README

data/extra/templates/skeletons/eflproject/TODO

@@ -0,0 +1 @@
+TODO

data/extra/templates/skeletons/eflproject/data/desktop/${edi_name}.desktop

@@ -1,12 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=@VERSION@
 Type=Application
-Name=@PACKAGE_NAME@
-Name[fr]=@PACKAGE_NAME@
+Name=${Edi_Name}
+Name[fr]=${Edi_Name}
 GenericName=${Edi_Name}
 Comment=Efl Application ${Edi_Name}
-Icon=@PACKAGE_NAME@
-TryExec=@PACKAGE_NAME@
-Exec=@PACKAGE_NAME@
+Icon=${Edi_Name}
+TryExec=${Edi_Name}
+Exec=${Edi_Name}
 Categories=Development;Utility;

data/extra/templates/skeletons/eflproject/data/desktop/meson.build

@@ -0,0 +1,5 @@
+install_data('${edi_name}.desktop',
+            install_dir: join_paths(dir_data, 'applications'))
+
+install_data('${edi_name}.png',
+            install_dir: join_paths(dir_data, 'icons'))

data/extra/templates/skeletons/eflproject/data/meson.build

@@ -0,0 +1,2 @@
+subdir('desktop')
+subdir('themes')

data/extra/templates/skeletons/eflproject/data/themes/default/meson.build

@@ -0,0 +1,15 @@
+edje_cc = find_program('edje_cc')
+
+cmd = [ edje_cc,
+	'-id', join_paths(meson.source_root(), 'data', 'themes', 'default', 'images'), 
+	'-sd', join_paths(meson.source_root(), 'data', 'themes', 'default', 'sounds'),
+	'@INPUT@', '@OUTPUT@'
+      ]
+
+custom_target('default.edj',
+  input : 'default.edc',
+  output : 'default.edj',
+  command: cmd,
+  install_dir: join_paths(get_option('prefix'), get_option('datadir'), '${edi_name}', 'themes'),
+  install: true
+  )

data/extra/templates/skeletons/eflproject/data/themes/meson.build

@@ -0,0 +1 @@
+subdir('default')

data/extra/templates/skeletons/eflproject/meson.build

@@ -0,0 +1,36 @@
+##### Project
+project('${edi_name}', 'c',
+	version       : '0.0.1',
+	meson_version : '>= 0.40.0')
+
+efl_version = '>= 1.22.0'
+
+cfg = configuration_data()
+
+host_os = host_machine.system()
+
+deps_os = declare_dependency(link_args : [] )
+if host_os == 'freebsd'
+  deps_os = declare_dependency(link_args : ['-I/usr/local/include', '-lintl'])
+endif
+
+deps = dependency('elementary', version: efl_version)
+
+##### dir locations
+dir_prefix = get_option('prefix')
+dir_bin    = join_paths(dir_prefix, get_option('bindir'))
+dir_lib    = join_paths(dir_prefix, get_option('libdir'))
+dir_data   = join_paths(dir_prefix, get_option('datadir'))
+dir_locale = join_paths(dir_prefix, get_option('localedir'))
+
+subdir('data')
+subdir('po')
+subdir('src')
+
+##### config.h
+cfg.set('HAVE_CONFIG_H', 1)
+cfg.set_quoted('PACKAGE', '${edi_name}')
+cfg.set_quoted('PACKAGE_VERSION', meson.project_version())
+cfg.set_quoted('PACKAGE_DATA_DIR', join_paths(dir_data, '${edi_name}'))
+configure_file(output: 'config.h', configuration: cfg)
+

data/extra/templates/skeletons/eflproject/po/meson.build

@@ -0,0 +1,6 @@
+i18n = import('i18n')
+i18n.gettext('${edi_name}')
+
+cfg.set('ENABLE_NLS', 1)
+cfg.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
+

data/extra/templates/skeletons/eflproject/src/bin/${edi_name}_main.c

@@ -1,18 +1,12 @@
-#ifdef HAVE_CONFIG_H
 # include "config.h"
-#endif
 
-/* NOTE: Respecting header order is important for portability.
- * Always put system first, then EFL, then your public header,
- * and finally your private one. */
+#if ENABLE_NLS
+# include <libintl.h>
+#endif
 
 #include <Ecore_Getopt.h>
 #include <Elementary.h>
 
-#include "gettext.h"
-
-#include "${Edi_Name}.h"
-
 #include "${edi_name}_private.h"
 
 #define COPYRIGHT "Copyright © ${Edi_Year} ${Edi_User} <${Edi_Email}> and various contributors (see AUTHORS)."
@@ -37,11 +31,14 @@ ${edi_name}_win_setup(void)
 
    label = elm_label_add(win);
    elm_object_text_set(label, " Hello World !");
-   evas_object_size_hint_weight_set(label, 0.0, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(label, 0.0, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(label);
 
    elm_win_resize_object_add(win, label);
+   evas_object_resize(win, 300 * elm_config_scale_get(),
+                           200 * elm_config_scale_get());
+   elm_win_center(win, EINA_TRUE, EINA_TRUE);
 
    evas_object_show(win);
 
@@ -53,7 +50,7 @@ static const Ecore_Getopt optdesc = {
   "%prog [options]",
   PACKAGE_VERSION,
   COPYRIGHT,
-  "BSD with advertisement clause",
+  "3 clause BSD license",
   "An EFL ${edi_name} program",
   0,
   {
@@ -87,8 +84,6 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
    textdomain(PACKAGE);
 #endif
 
-   ${edi_name}_init();
-
    args = ecore_getopt_parse(&optdesc, values, argc, argv);
    if (args < 0)
      {
@@ -105,12 +100,9 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
    if (!(win = ${edi_name}_win_setup()))
      goto end;
 
-   ${edi_name}_library_call();
-
    elm_run();
 
  end:
-   ${edi_name}_shutdown();
    elm_shutdown();
 
    return 0;

data/extra/templates/skeletons/eflproject/src/bin/meson.build

@@ -0,0 +1,11 @@
+inc = include_directories('.', '../..')
+
+executable('${edi_name}', [
+  '${edi_name}_main.c',
+  '${edi_name}_private.h',
+  'gettext.h'
+  ],
+  include_directories: inc,
+  dependencies: [ deps, deps_os ],
+  gui_app : true,
+  install : true)

data/extra/templates/skeletons/eflproject/src/meson.build

@@ -0,0 +1 @@
+subdir('bin')

data/extra/templates/skeletons/eflproject_python/COPYING

@@ -0,0 +1,29 @@
+
+Copyright (C) ${Edi_Year} ${Edi_User} <${Edi_Email}>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+   may be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/extra/templates/skeletons/eflproject_python/README

@@ -0,0 +1 @@
+README

data/extra/templates/skeletons/eflproject_python/bin/${Edi_Name}

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import sys
+from ${Edi_Name}.main import main
+
+sys.exit(main())

data/extra/templates/skeletons/eflproject_python/data/desktop/${edi_name}.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=${Edi_Name}
+Name[fr]=${Edi_Name}
+GenericName=${Edi_Name}
+Comment=Efl Application ${Edi_Name}
+Icon=${edi_name}
+TryExec=${edi_name}
+Exec=${edi_name}
+Categories=Development;Utility;

data/extra/templates/skeletons/eflproject_python/setup.py

@@ -0,0 +1,70 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+#  python setup.py check
+#  python setup.py build
+#  python setup.py run
+#  python setup.py install
+#  python setup.py clean --all
+
+
+from distutils.core import setup, Command
+from distutils.version import StrictVersion
+from efl.utils.setup import build_extra, build_edc, build_fdo, build_i18n, uninstall
+from efl import __version__ as efl_version
+
+
+MIN_EFL = '1.18'
+if StrictVersion(efl_version) < MIN_EFL:
+    print('Your python-efl version is too old! Found: ' + efl_version)
+    print('You need at least version ' + MIN_EFL)
+    exit(1)
+
+
+class run_in_tree(Command):
+   description = 'Run the main() from the build folder (without install)'
+   user_options = []
+
+   def initialize_options(self):
+      pass
+
+   def finalize_options(self):
+      pass
+
+   def run(self):
+        import sys, platform
+
+        sys.path.insert(0, 'build/lib.%s-%s-%d.%d' % (
+            platform.system().lower(), platform.machine(),
+            sys.version_info[0], sys.version_info[1]))
+
+        from ${Edi_Name}.main import main
+        sys.exit(main())
+
+
+setup(
+    name = '${Edi_Name}',
+    version = '0.0.1',
+    description = 'Short description',
+    long_description = 'A longer description of your project',
+    author = '${Edi_User}',
+    author_email = '${Edi_Email}',
+    url = '${Edi_Url}',
+    license = "3-Clause BSD",
+    package_dir = {'${Edi_Name}': 'src'},
+    packages = ['${Edi_Name}'],
+    requires = ['efl'],
+    scripts = ['bin/${Edi_Name}'],
+    cmdclass = {
+        'build': build_extra,
+        'build_fdo': build_fdo,
+        # 'build_edc': build_edc,
+        # 'build_i18n': build_i18n,
+        'run': run_in_tree,
+        'uninstall': uninstall,
+    },
+    command_options = {
+        'install': {'record': ('setup.py', 'installed_files.txt')}
+    },
+)
+