[EGIT] [tools/edi] master 01/02: build: meson, fine tweaking of meson preparation.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=1a4533b4714f02b25518a1608792e0fb2a7130ca commit 1a4533b4714f02b25518a1608792e0fb2a7130ca Author: Al PooleDate: Sat Oct 21 23:49:39 2017 +0100 build: meson, fine tweaking of meson preparation. --- src/lib/edi_build_provider_meson.c | 21 + 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/lib/edi_build_provider_meson.c b/src/lib/edi_build_provider_meson.c index 01f10df..a62f72d 100644 --- a/src/lib/edi_build_provider_meson.c +++ b/src/lib/edi_build_provider_meson.c @@ -100,35 +100,16 @@ _meson_ninja_do(Meson_Data *md, const char *arg) } static Eina_Bool -_meson_prepare_end(void *data, int evtype EINA_UNUSED, void *evinfo) -{ - Meson_Data *me = data; - Ecore_Exe_Event_Del *ev = evinfo; - - if (!ev->exe) return ECORE_CALLBACK_RENEW; - if (ecore_exe_data_get(ev->exe) != me) return ECORE_CALLBACK_RENEW; - - return ECORE_CALLBACK_RENEW; -} - -static Eina_Bool _meson_prepare(Meson_Data *md) { const char *cmd; - Ecore_Exe *exe; if (_meson_configured_check(md->fulldir)) return EINA_TRUE; if (chdir(md->basedir) != 0) return EINA_FALSE; cmd = eina_slstr_printf("meson %s && %s", md->builddir, _meson_ninja_cmd(md, "")); - exe = ecore_exe_pipe_run(cmd, -ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ | -ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR | -ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, md); - - if (!exe) return EINA_FALSE; - ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _meson_prepare_end, md); + edi_exe_notify("edi_build", cmd); return EINA_FALSE; } --
[EGIT] [tools/edi] master 02/02: Merge branch 'master' of git+ssh://git.enlightenment.org/tools/edi
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=70a5ee304b3c84d79e253b61f615b3d568768b09 commit 70a5ee304b3c84d79e253b61f615b3d568768b09 Merge: 1a4533b 1d2cf4a Author: Al PooleDate: Sat Oct 21 23:50:09 2017 +0100 Merge branch 'master' of git+ssh://git.enlightenment.org/tools/edi INSTALL | 376 --- Makefile.am | 108 --- Makefile_Edje_Helper.am | 9 - Makefile_Eolian_Helper.am| 24 --- README | 36 README.md| 19 +- autogen.sh | 15 -- configure.ac | 219 --- data/Makefile.am | 4 - data/desktop/Makefile.am | 9 - data/extra/Makefile.am | 4 - data/extra/templates/Makefile.am | 28 --- data/images/Makefile.am | 8 - data/themes/Makefile.am | 4 - data/themes/default/Makefile.am | 22 --- doc/Makefile.am | 38 m4/efl.m4| 123 - m4/efl_binary.m4 | 79 m4/efl_compiler_flag.m4 | 57 -- m4/efl_doxygen.m4| 98 -- m4/efl_path_max.m4 | 36 m4/efl_tests.m4 | 65 --- packaging/Makefile.am| 4 - packaging/pkgbuild/Makefile.am | 3 - src/Makefile.am | 4 - src/bin/Makefile.am | 81 - src/lib/Makefile.am | 41 - src/tests/Makefile.am| 35 28 files changed, 46 insertions(+), 1503 deletions(-) --
[EGIT] [tools/edi] master 01/01: Remove old autotools build files - meson only now
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=1d2cf4af88c8bc3a4e9a3eca4b9914f6709650c5 commit 1d2cf4af88c8bc3a4e9a3eca4b9914f6709650c5 Author: Andy WilliamsDate: Sat Oct 21 22:37:31 2017 +0100 Remove old autotools build files - meson only now --- INSTALL | 376 --- Makefile.am | 108 --- Makefile_Edje_Helper.am | 9 - Makefile_Eolian_Helper.am| 24 --- README | 36 README.md| 19 +- autogen.sh | 15 -- configure.ac | 219 --- data/Makefile.am | 4 - data/desktop/Makefile.am | 9 - data/extra/Makefile.am | 4 - data/extra/templates/Makefile.am | 28 --- data/images/Makefile.am | 8 - data/themes/Makefile.am | 4 - data/themes/default/Makefile.am | 22 --- doc/Makefile.am | 38 m4/efl.m4| 123 - m4/efl_binary.m4 | 79 m4/efl_compiler_flag.m4 | 57 -- m4/efl_doxygen.m4| 98 -- m4/efl_path_max.m4 | 36 m4/efl_tests.m4 | 65 --- packaging/Makefile.am| 4 - packaging/pkgbuild/Makefile.am | 3 - src/Makefile.am | 4 - src/bin/Makefile.am | 81 - src/lib/Makefile.am | 41 - src/tests/Makefile.am| 35 28 files changed, 46 insertions(+), 1503 deletions(-) diff --git a/INSTALL b/INSTALL index 007e939..3cbfe67 100644 --- a/INSTALL +++ b/INSTALL @@ -1,370 +1,60 @@ -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. +For meson build generic options: - 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 --help - 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 a list of project specific options supported: - The simplest way to compile this package is: +cat meson_options.txt - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. +To set 1 or more project specific options: - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. +
[EGIT] [website/www-content] master 01/01: Move EFL reference lookups
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=200bce61940ab4087aa6efdeca6cfdf79bc56b44 commit 200bce61940ab4087aa6efdeca6cfdf79bc56b44 Author: Andy WilliamsDate: Sat Oct 21 16:41:05 2017 +0100 Move EFL reference lookups --- pages/{docs => develop}/efl/ref/c/key/evas_object_del.txt | 0 pages/{docs => develop}/efl/ref/c/key/evas_object_ref.txt | 0 pages/{docs => develop}/efl/ref/c/keyword-link.txt| 0 pages/{docs => develop}/efl/ref/c/keyword-list.txt| 0 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/pages/docs/efl/ref/c/key/evas_object_del.txt b/pages/develop/efl/ref/c/key/evas_object_del.txt similarity index 100% rename from pages/docs/efl/ref/c/key/evas_object_del.txt rename to pages/develop/efl/ref/c/key/evas_object_del.txt diff --git a/pages/docs/efl/ref/c/key/evas_object_ref.txt b/pages/develop/efl/ref/c/key/evas_object_ref.txt similarity index 100% rename from pages/docs/efl/ref/c/key/evas_object_ref.txt rename to pages/develop/efl/ref/c/key/evas_object_ref.txt diff --git a/pages/docs/efl/ref/c/keyword-link.txt b/pages/develop/efl/ref/c/keyword-link.txt similarity index 100% rename from pages/docs/efl/ref/c/keyword-link.txt rename to pages/develop/efl/ref/c/keyword-link.txt diff --git a/pages/docs/efl/ref/c/keyword-list.txt b/pages/develop/efl/ref/c/keyword-list.txt similarity index 100% rename from pages/docs/efl/ref/c/keyword-list.txt rename to pages/develop/efl/ref/c/keyword-list.txt --
[EGIT] [core/efl] master 01/01: Docs location moved
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=549f16700242841a9f212e3a209b579920c3240c commit 549f16700242841a9f212e3a209b579920c3240c Author: Andy WilliamsDate: Sat Oct 21 16:38:57 2017 +0100 Docs location moved --- src/scripts/elua/apps/gendoc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua index a715a8d591..63ad69bf36 100644 --- a/src/scripts/elua/apps/gendoc.lua +++ b/src/scripts/elua/apps/gendoc.lua @@ -1601,7 +1601,7 @@ getopt.parse { set_theme(opts["graph-theme"]) end local rootns = (not opts["n"] or opts["n"] == "") -and "docs:efl" or opts["n"] +and "develop:efl" or opts["n"] local dr if not opts["r"] or opts["r"] == "" then dr = "dokuwiki/data/pages" --
[EGIT] [website/www-content] master 01/01: Wiki page start changed with summary [] by Xavi Artigas
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=aaf60c4831d6c66e2c634af992d1c91b031d9023 commit aaf60c4831d6c66e2c634af992d1c91b031d9023 Author: Xavi ArtigasDate: Sat Oct 21 08:28:47 2017 -0700 Wiki page start changed with summary [] by Xavi Artigas --- pages/develop/efl/start.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/develop/efl/start.txt b/pages/develop/efl/start.txt index 95a7eed5..29aa7019 100644 --- a/pages/develop/efl/start.txt +++ b/pages/develop/efl/start.txt @@ -43,7 +43,7 @@ You will use a range of libraries to make use of the above, and so learning the |Elua|Lua Execution|*INTERNAL* Lua wrapper and convenience layer for running a Lua script engine | |Embryo |Bytecode VM & Compiler |A compiler and tiny VM execution library for the Small/Pawn language used by Edje for scripting | |Emile |Compression & Encryption |*INTERNAL* Compression and encryption utilities and abstractions | -|Emotion |Video & Audio Playback |Wrapping Gstreamer, Xine and/or VLC to provide Video playback in Evas objects as well as audio playback controls | +|Emotion |Video & Audio Playback |Wrapping GStreamer, Xine and/or VLC to provide Video playback in Evas objects as well as audio playback controls | |Eo |Object System|Core object system for EFL with handling of classes, references, inheritance, safe object access and method execution etc. | |Eolian |Object Code Generation |Used with Eo to generate both C boilerplate src, and for generating bindings | |Ephysics|Physics & Object Glue|Glues the Bullet physics library to Evas objects and is used by Edje | --
[EGIT] [website/www-content] master 01/01: Wiki page button changed with summary [] by Xavi Artigas
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=36b36152a5fb043acaad8480d6358cba57684264 commit 36b36152a5fb043acaad8480d6358cba57684264 Author: Xavi ArtigasDate: Sat Oct 21 08:13:10 2017 -0700 Wiki page button changed with summary [] by Xavi Artigas --- pages/tutorial/basic/button.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/tutorial/basic/button.txt b/pages/tutorial/basic/button.txt index f56c2fc0..7723cb81 100644 --- a/pages/tutorial/basic/button.txt +++ b/pages/tutorial/basic/button.txt @@ -5,7 +5,7 @@ //**__Basic text button__**// As seen in [[docs/efl/start|Get started with EFL]] tutorial, a text-only -button is created as follow : +button is created as follows: //basic text button --
[EGIT] [tools/edi] master 01/01: edi_main: find a consistent icon for "close" across icon themes.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=8b9d3106d5b221003fae9ac60484c4287ee32a65 commit 8b9d3106d5b221003fae9ac60484c4287ee32a65 Author: Al PooleDate: Sat Oct 21 14:19:40 2017 +0100 edi_main: find a consistent icon for "close" across icon themes. tested with adwaita, elm, faenza, breeze etc etc. --- src/bin/edi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c index 606b699..b1b04c5 100644 --- a/src/bin/edi_main.c +++ b/src/bin/edi_main.c @@ -1147,8 +1147,8 @@ _edi_menu_setup(Evas_Object *win) elm_menu_item_add(menu, menu_it, "document-new", _("New ..."), _edi_menu_new_cb, NULL); elm_menu_item_add(menu, menu_it, "folder-new", _("New Directory ..."), _edi_menu_new_dir_cb, NULL); _edi_menu_save = elm_menu_item_add(menu, menu_it, "document-save", _("Save"), _edi_menu_save_cb, NULL); - elm_menu_item_add(menu, menu_it, "document-close", _("Close"), _edi_menu_close_cb, NULL); - elm_menu_item_add(menu, menu_it, "document-close", _("Close all"), _edi_menu_closeall_cb, NULL); + elm_menu_item_add(menu, menu_it, "window-close", _("Close"), _edi_menu_close_cb, NULL); + elm_menu_item_add(menu, menu_it, "window-close", _("Close all"), _edi_menu_closeall_cb, NULL); elm_menu_item_separator_add(menu, menu_it); elm_menu_item_add(menu, menu_it, "preferences-desktop", _("Settings"), _edi_menu_settings_cb, NULL); elm_menu_item_separator_add(menu, menu_it); @@ -1228,7 +1228,7 @@ edi_toolbar_setup(Evas_Object *parent) _edi_toolbar_item_add(tb, "document-new", _("New File"), _tb_new_cb); _edi_toolbar_save =_edi_toolbar_item_add(tb, "document-save", _("Save"), _tb_save_cb); - _edi_toolbar_item_add(tb, "document-close", _("Close"), _tb_close_cb); + _edi_toolbar_item_add(tb, "window-close", _("Close"), _tb_close_cb); tb_it = elm_toolbar_item_append(tb, "separator", "", NULL, NULL); elm_toolbar_item_separator_set(tb_it, EINA_TRUE); --
[EGIT] [tools/edi] master 01/01: edi_scm: use better gravity when loading the diff into the widget.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=316b7db9bdef37a62fcaa745983eeb7f4ac428a0 commit 316b7db9bdef37a62fcaa745983eeb7f4ac428a0 Author: Al PooleDate: Sat Oct 21 14:09:57 2017 +0100 edi_scm: use better gravity when loading the diff into the widget. --- src/bin/edi_scm_ui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c index 1ef46b8..47bd316 100644 --- a/src/bin/edi_scm_ui.c +++ b/src/bin/edi_scm_ui.c @@ -741,7 +741,7 @@ edi_scm_ui_add(Evas_Object *parent) edi_scm->code = code = elm_code_create(); entry = elm_code_widget_add(box, code); elm_code_parser_standard_add(code, ELM_CODE_PARSER_STANDARD_DIFF); - elm_obj_code_widget_gravity_set(entry, 1.0, 0.0); + elm_obj_code_widget_gravity_set(entry, 0.0, 0.0); elm_obj_code_widget_editable_set(entry, EINA_FALSE); elm_obj_code_widget_line_numbers_set(entry, EINA_FALSE); evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); --
[EGIT] [tools/edi] master 01/01: edi_file: replace. use a local temp directory rather than /tmp.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=3ec3d476fde66d39d188dba9917d9da3b73b3c65 commit 3ec3d476fde66d39d188dba9917d9da3b73b3c65 Author: Al PooleDate: Sat Oct 21 14:05:13 2017 +0100 edi_file: replace. use a local temp directory rather than /tmp. This is firstly more portable and also some distrbutors won't allow us to move from /tmp (wise). --- src/bin/edi_file.c | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/bin/edi_file.c b/src/bin/edi_file.c index a67e79e..4c94928 100644 --- a/src/bin/edi_file.c +++ b/src/bin/edi_file.c @@ -1,5 +1,6 @@ #include "Edi.h" #include "edi_file.h" +#include "edi_config.h" #include "edi_private.h" Eina_Bool @@ -23,10 +24,14 @@ edi_file_text_replace(const char *path, const char *search, const char *replace) char *map, *found; FILE *tempfile; Eina_File *f; - char tempfilepath[PATH_MAX]; + char *tempfiledir, *tempfilepath; unsigned long long len, idx; unsigned int slen; + tempfiledir = edi_path_append(_edi_config_dir_get(), ".tmp"); + + ecore_file_mkdir(tempfiledir); + f = eina_file_open(path, EINA_FALSE); if (!f) return; @@ -44,7 +49,7 @@ edi_file_text_replace(const char *path, const char *search, const char *replace) return; } - snprintf(tempfilepath, sizeof(tempfilepath), "/tmp/%s.tmp", ecore_file_file_get(path)); + tempfilepath = edi_path_append(tempfiledir, ecore_file_file_get(path)); tempfile = fopen(tempfilepath, "wb"); if (!tempfile) goto done; @@ -78,9 +83,11 @@ edi_file_text_replace(const char *path, const char *search, const char *replace) fclose(tempfile); ecore_file_mv(tempfilepath, path); + free(tempfilepath); done: eina_file_map_free(f, map); eina_file_close(f); + free(tempfiledir); } static void --