enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elementary: merge in elm_code example.

This commit is contained in:
Cedric BAIL 2016-06-03 14:17:27 -07:00
parent f3d5ae6ec2
commit 412071497d
10 changed files with 22 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elm_code/Makefile.am
View File

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

4
legacy/elm_code/src/Makefile.am
View File

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

20
legacy/elm_code/src/bin/Makefile.am
View File

@ -1,20 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = elm_code_test
AM_CPPFLAGS = \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-I$(top_srcdir)/elm_code/src/lib/ \
-I$(top_builddir)/elm_code/src/lib/ \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DDATA_DIR=\"$(abspath $(srcdir))/../tests/\" \
-DEFL_BETA_API_SUPPORT \
@EFL_CFLAGS@
elm_code_test_SOURCES = \
elm_code_test_main.c \
elm_code_test_private.h
elm_code_test_LDADD = @EFL_LIBS@ $(top_builddir)/elm_code/src/lib/libelm_code.la

73
legacy/elm_code/src/lib/Makefile.am
View File

@ -1,73 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = widget
CLEANFILES=
EOLIAN_FLAGS = @DEPS_EOLIAN_FLAGS@ \
-I$(top_srcdir)/elm_code/src/lib
include $(top_srcdir)/Makefile_Eolian_Helper.am
AM_CPPFLAGS = \
-I$(top_srcdir)/elm_code/src/lib \
-I$(top_builddir)/elm_code/src/lib \
-I$(top_srcdir)/elm_code/src/lib/widget \
-I$(top_builddir)/elm_code/src/lib/widget \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-DEFL_BETA_API_SUPPORT \
-DEFL_EO_API_SUPPORT \
@EFL_CFLAGS@ \
-DEFL_ELM_CODE_BUILD
lib_LTLIBRARIES = libelm_code.la
includes_HEADERS = \
elm_code_common.h \
elm_code_line.h \
elm_code_text.h \
elm_code_file.h \
elm_code_parse.h \
widget/elm_code_widget.eo.h \
widget/elm_code_widget.eo.legacy.h \
widget/elm_code_widget_legacy.h \
widget/elm_code_widget_selection.h \
elm_code_diff_widget.h \
Elm_Code.h
includesdir = $(includedir)/edi-@VMAJ@
libelm_code_la_SOURCES = \
elm_code_line.c \
elm_code_text.c \
elm_code_file.c \
elm_code_parse.c \
widget/elm_code_widget_selection.c \
widget/elm_code_widget.c \
elm_code_diff_widget.c \
elm_code.c \
elm_code_private.h \
widget/elm_code_widget_private.h
libelm_code_la_LIBADD = @EFL_LIBS@ -lm
libelm_code_la_LDFLAGS = -no-undefined @EFL_LTLIBRARY_FLAGS@
elm_code_eolian_files = \
widget/elm_code_widget.eo
elm_code_eolian_c = $(elm_code_eolian_files:%.eo=%.eo.c)
elm_code_eolian_h = $(elm_code_eolian_files:%.eo=%.eo.h)
elm_code_eolian_legacy_h = $(elm_code_eolian_files:%.eo=%.eo.legacy.h)
BUILT_SOURCES = \
$(elm_code_eolian_c) \
$(elm_code_eolian_h) \
$(elm_code_eolian_legacy_h)
elmcodeeolianfilesdir = $(datadir)/eolian/include/elm_code-@VMAJ@
elmcodeeolianfiles_DATA = $(elm_code_eolian_files)
EXTRA_DIST = ${elmcodeeolianfiles_DATA} \
widget/elm_code_widget_text.c \
widget/elm_code_widget_undo.c
CLEANFILES += $(elm_code_eolian_h) $(elm_code_eolian_legacy_h)

0
legacy/elm_code/src/lib/widget/Makefile.am
View File

49
legacy/elm_code/src/tests/Makefile.am
View File

@ -1,49 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = check-results.xml
if EFL_HAVE_TESTS
check_PROGRAMS = elm_code_suite
elm_code_suite_SOURCES = \
elm_code_file_test_load.c \
elm_code_file_test_memory.c \
elm_code_test_basic.c \
elm_code_test_line.c \
elm_code_test_parse.c \
elm_code_test_text.c \
widget/elm_code_test_widget.c \
widget/elm_code_test_widget_text.c \
widget/elm_code_test_widget_selection.c \
widget/elm_code_test_widget_undo.c \
elm_code_suite.c
elm_code_suite_CPPFLAGS = \
-DEFL_BETA_API_SUPPORT \
-DEFL_EO_API_SUPPORT \
-I$(top_srcdir)/elm_code/src/lib \
-I$(top_builddir)/elm_code/src/lib \
-I$(top_srcdir)/elm_code/src/lib/widget \
-I$(top_builddir)/elm_code/src/lib/widget \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-DPACKAGE_TESTS_DIR=\"$(top_srcdir)/elm_code/src/tests/\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/elm_code/src/tests/\" \
-DTESTS_DIR=\"$(abspath $(srcdir))/\" \
-DEFL_BETA_API_SUPPORT \
@EFL_CFLAGS@ \
-DEFL_ELM_CODE_BUILD \
@CHECK_CFLAGS@
elm_code_suite_LDADD = @EFL_LIBS@ @CHECK_LIBS@ $(top_builddir)/elm_code/src/lib/libelm_code.la
elm_code_suite_DEPENDENCIES = $(top_builddir)/elm_code/src/lib/libelm_code.la
testdir = $(PACKAGE_TESTS_DIR)
test_DATA = \
testfile.txt \
testfile-windows.txt \
testfile-withblanks.txt \
testdiff.diff
EXTRA_DIST = elm_code_suite.h $(test_DATA)
endif

18
src/Makefile_Elementary.am
View File

@ -723,7 +723,8 @@ bin_PROGRAMS += \
bin/elementary/elementary_test \
bin/elementary/elementary_config \
bin/elementary/elementary_codegen \
bin/elementary/elm_prefs_cc
bin/elementary/elm_prefs_cc \
bin/elementary/elementary_code
if BUILD_QUICKLAUNCH
bin_PROGRAMS += \
@ -861,6 +862,21 @@ bin_elementary_elementary_test_CPPFLAGS = \
-DPACKAGE_DATA_DIR=\"$(datadir)/elementary\" \
@ELEMENTARY_CFLAGS@
bin_elementary_elementary_code_SOURCES = \
bin/elementary/elm_code_test_main.c \
bin/elementary/elm_code_test_private.h
bin_elementary_elementary_code_LDADD = @USE_ELEMENTARY_LIBS@
bin_elementary_elementary_code_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
bin_elementary_elementary_code_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/src/lib/elementary \
-I$(top_builddir)/src/lib/elementary \
-I$(top_srcdir)/src/bin/elementary \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/elementary\" \
-DLOCALE_DIR=\"$(localedir)\" \
@ELEMENTARY_CFLAGS@
bin_elementary_elementary_config_SOURCES = bin/elementary/config.c
bin_elementary_elementary_config_LDADD = @USE_ELEMENTARY_LIBS@

1
src/bin/elementary/.gitignore vendored
View File

@ -5,3 +5,4 @@
/elementary_codegen
/elementary_testql
/elm_prefs_cc
/elementary_code

10
legacy/elm_code/src/bin/elm_code_test_main.c → src/bin/elementary/elm_code_test_main.c
View File

@ -1,5 +1,5 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
# include "elementary_config.h"
#endif
/* NOTE: Respecting header order is important for portability.
@ -13,8 +13,6 @@
#include <Ecore_Getopt.h>
#include <Elementary.h>
#include <Elm_Code.h>
#include "elm_code_test_private.h"
#define COPYRIGHT "Copyright © 2014 andy <andy@andywilliams.me> and various contributors (see AUTHORS)."
@ -149,7 +147,7 @@ _elm_code_test_diff_inline_setup(Evas_Object *parent)
evas_object_show(diff);
elm_code_parser_standard_add(code, ELM_CODE_PARSER_STANDARD_DIFF);
elm_code_file_open(code, DATA_DIR "testdiff.diff");
elm_code_file_open(code, PACKAGE_DATA_DIR "testdiff.diff");
return diff;
}
@ -161,7 +159,7 @@ _elm_code_test_diff_setup(Evas_Object *parent)
Elm_Code *code;
code = elm_code_create();
elm_code_file_open(code, DATA_DIR "testdiff.diff");
elm_code_file_open(code, PACKAGE_DATA_DIR "testdiff.diff");
diff = elm_code_diff_widget_add(parent, code);
return diff;
@ -403,7 +401,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
#if ENABLE_NLS
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
bindtextdomain(PACKAGE, LOCALE_DIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
textdomain(PACKAGE);
#endif

0
legacy/elm_code/src/bin/elm_code_test_private.h → src/bin/elementary/elm_code_test_private.h
View File