From 1c8a1bed4e93a96ca503d37d3d43d5ce13a12002 Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Sun, 25 Jan 2015 17:10:51 +0100 Subject: bla --- configure.ac | 23 ++++++++++++----------- doc/eulogium.1 | 2 +- src/Makefile.am | 4 +++- src/eulogium | Bin 17860 -> 0 bytes src/eulogium.c | 42 ++++++++++++++++++++++++++++++++---------- 5 files changed, 48 insertions(+), 23 deletions(-) delete mode 100755 src/eulogium diff --git a/configure.ac b/configure.ac index 2671436..5ce9a7e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ EFL_VERSION([0], [0], [1], [dev]) -AC_INIT([eulogium], [efl_version], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([eulogium], [efl_version], [support@ultimaker.com], [], [http://www.ultimaker.com]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([configure.ac]) @@ -30,20 +30,21 @@ EFL_CHECK_PATH_MAX # Check for EFL PKG_CHECK_MODULES([EFL], [ - eina >= 1.8.0 - evas >= 1.8.0 - ecore-evas >= 1.8.0 - ecore >= 1.8.0 - edje >= 1.8.0 + eina >= 1.8.0 + evas >= 1.8.0 + ecore-evas >= 1.8.0 + ecore >= 1.8.0 + edje >= 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]) + [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}]) diff --git a/doc/eulogium.1 b/doc/eulogium.1 index fb25823..aa69c7a 100644 --- a/doc/eulogium.1 +++ b/doc/eulogium.1 @@ -37,7 +37,7 @@ Print list of options with short description. .SH BUGS -Reports are welcome. Send them at enlightenment-devel@lists.sourceforge.net. +Reports are welcome. Send them at support@ultimaker.com. .SH HOMEPAGE diff --git a/src/Makefile.am b/src/Makefile.am index 6d27e95..eb42730 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,9 @@ SUBDIRS = tests bin_PROGRAMS = eulogium -AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +AM_CPPFLAGS = -DPACKAGE_BIN_DIR=\"$(bindir)/\" \ + -DPACKAGE_LIB_DIR=\"$(bindir)/\" \ + -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -I$(top_builddir)/src/ \ -I$(top_srcdir)/src/ \ @EFL_CFLAGS@ diff --git a/src/eulogium b/src/eulogium deleted file mode 100755 index e6223a7..0000000 Binary files a/src/eulogium and /dev/null differ diff --git a/src/eulogium.c b/src/eulogium.c index bbe259c..e97758c 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -5,17 +5,19 @@ #include #include #include +#include #include +#include #include "gettext.h" -#define COPYRIGHT "Copyright © 2015 oliver and various contributors (see AUTHORS)." +#define COPYRIGHT "Copyright © 2015 Olliver Schinagl and various contributors (see AUTHORS)." + +#define EULOGIUM_THEME "eulogium.edj" int main(int argc EINA_UNUSED, char **argv EINA_UNUSED) { -#if 0 Eina_Bool quit_option = EINA_FALSE; - int args; static const Ecore_Getopt optdesc = { "eulogium", "%prog [options]", @@ -32,8 +34,6 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED) ECORE_GETOPT_SENTINEL } }; - - Ecore_Getopt_Value values[] = { ECORE_GETOPT_VALUE_BOOL(quit_option), ECORE_GETOPT_VALUE_BOOL(quit_option), @@ -41,8 +41,12 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED) ECORE_GETOPT_VALUE_BOOL(quit_option), ECORE_GETOPT_VALUE_NONE }; - args = ecore_getopt_parse(&optdesc, values, argc, argv); -#endif + int args; + Eina_Prefix *prefix; + Ecore_Evas *ee; + Evas *canvas; + Eina_List *engines, *l; + const char *eulogium_edj = EULOGIUM_THEME; #if ENABLE_NLS setlocale(LC_ALL, ""); @@ -51,11 +55,29 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED) textdomain(PACKAGE); #endif - eina_init(); + if (!ecore_evas_init()) + return EXIT_FAILURE; + + if (!edje_init()) + return EXIT_FAILURE; - EINA_LOG_CRIT("Could not parse arguments."); + prefix = eina_prefix_new(argv[0], main, + "EULOGIUM", + "eulogium", + eulogium_edj, + PACKAGE_BIN_DIR, + PACKAGE_LIB_DIR, + PACKAGE_DATA_DIR, + LOCALE_DIR); + + args = ecore_getopt_parse(&optdesc, values, argc, argv); + if (args < 0) + EINA_LOG_CRIT("Could not parse arguments."); + if (args == 1) + ecore_getopt_help(stderr, &optdesc); - eina_shutdown(); + ecore_evas_shutdown(); + edje_shutdown(); return 0; } -- cgit v0.12