[EGIT] [core/efl] master 01/01: ecore win32: modifiy to better meaningful exception.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0647f6877078561d425bac8195a41b9adb927b35 commit 0647f6877078561d425bac8195a41b9adb927b35 Author: ChunEon Park her...@hermet.pe.kr Date: Sat Aug 29 16:46:22 2015 +0900 ecore win32: modifiy to better meaningful exception. --- src/lib/ecore/ecore_exe_win32.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c index 7da75fd..6e6226c 100644 --- a/src/lib/ecore/ecore_exe_win32.c +++ b/src/lib/ecore/ecore_exe_win32.c @@ -376,6 +376,8 @@ _impl_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe) DBG(Creating process %s, exe_cmd); Ecore_Exe_Flags flags = exe-flags; + if (!exe_cmd) goto error; + if ((flags ECORE_EXE_PIPE_AUTO) (!(flags ECORE_EXE_PIPE_ERROR)) (!(flags ECORE_EXE_PIPE_READ))) /* We need something to auto pipe. */ @@ -411,9 +413,6 @@ _impl_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe) exe_cmd_buf[sizeof(exe_cmd_buf) - 1] = '\0'; } - if (!exe-cmd) - goto error; - /* stdout, stderr and stdin pipes */ sa.nLength = sizeof(SECURITY_ATTRIBUTES); --
[EGIT] [core/efl] master 01/01: ecore win32: increase command buffer size.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d71182af7a3c787b30cd6a5747b9d5f055fee003 commit d71182af7a3c787b30cd6a5747b9d5f055fee003 Author: ChunEon Park her...@hermet.pe.kr Date: Sat Aug 29 16:59:19 2015 +0900 ecore win32: increase command buffer size. PATH_MAX is not enough for command. Even in this case, the buffer is not being used only for path. --- src/lib/ecore/ecore_exe_win32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c index 6e6226c..f03b05b 100644 --- a/src/lib/ecore/ecore_exe_win32.c +++ b/src/lib/ecore/ecore_exe_win32.c @@ -362,7 +362,7 @@ _impl_ecore_exe_run_priority_get(void) Eo * _impl_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe) { - char exe_cmd_buf[PATH_MAX]; + char exe_cmd_buf[1024]; SECURITY_ATTRIBUTES sa; STARTUPINFO si; PROCESS_INFORMATION pi; --
[EGIT] [tools/edi] master 01/01: [elm_code] don't strip whitespace on current line
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=3999fb67fdae1b2acca7c892f6d4f9535bec9636 commit 3999fb67fdae1b2acca7c892f6d4f9535bec9636 Author: Andy Williams a...@andywilliams.me Date: Sat Aug 29 14:11:40 2015 +0100 [elm_code] don't strip whitespace on current line When saving if any widget has a cursor on the line we shouldn't strip the trailing whitespace --- elm_code/src/lib/elm_code_file.c | 3 ++- elm_code/src/lib/elm_code_line.c | 21 + elm_code/src/lib/elm_code_line.h | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/elm_code/src/lib/elm_code_file.c b/elm_code/src/lib/elm_code_file.c index 387e249..07ff643 100644 --- a/elm_code/src/lib/elm_code_file.c +++ b/elm_code/src/lib/elm_code_file.c @@ -178,7 +178,8 @@ EAPI void elm_code_file_save(Elm_Code_File *file) EINA_LIST_FOREACH(file-lines, item, line_item) { -elm_code_line_text_trailing_whitespace_strip(line_item); +if (!elm_code_line_contains_widget_cursor(line_item)) + elm_code_line_text_trailing_whitespace_strip(line_item); content = elm_code_line_text_get(line_item, length); fwrite(content, sizeof(char), length, out); diff --git a/elm_code/src/lib/elm_code_line.c b/elm_code/src/lib/elm_code_line.c index e0de0d5..ae921f7 100644 --- a/elm_code/src/lib/elm_code_line.c +++ b/elm_code/src/lib/elm_code_line.c @@ -106,3 +106,24 @@ EAPI void elm_code_line_status_clear(Elm_Code_Line *line) } } +EAPI Eina_Bool +elm_code_line_contains_widget_cursor(Elm_Code_Line *line) +{ + Elm_Code *code = line-file-parent; + Eina_List *item; + Eo *widget; + unsigned int col, number; + + if (!code) + return EINA_FALSE; + + EINA_LIST_FOREACH(code-widgets, item, widget) + { +elm_code_widget_cursor_position_get(widget, col, number); + +if (number == line-number) + return EINA_TRUE; + } + + return EINA_FALSE; +} diff --git a/elm_code/src/lib/elm_code_line.h b/elm_code/src/lib/elm_code_line.h index 6a0f767..822cbea 100644 --- a/elm_code/src/lib/elm_code_line.h +++ b/elm_code/src/lib/elm_code_line.h @@ -69,6 +69,8 @@ EAPI void elm_code_line_token_add(Elm_Code_Line *line, int start, int end, int l EAPI void elm_code_line_tokens_clear(Elm_Code_Line *line); +EAPI Eina_Bool elm_code_line_contains_widget_cursor(Elm_Code_Line *line); + /** * @} */ --
[EGIT] [admin/devs] master 01/01: New ssh public key
davemds pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=ab88abdf96341821ca65beb4428e364e00544423 commit ab88abdf96341821ca65beb4428e364e00544423 Author: Dave Andreoli d...@gurumeditation.it Date: Sat Aug 29 14:07:08 2015 +0200 New ssh public key --- developers/davemds/id_dsa.pub | 1 - developers/davemds/id_ed25519.pub | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/developers/davemds/id_dsa.pub b/developers/davemds/id_dsa.pub deleted file mode 100644 index ff0c26c..000 --- a/developers/davemds/id_dsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss B3NzaC1kc3MAAACBAMU/VyOhr5ZKp+QUZRcXYzaNZPvZzeFWxOLEuQTOLO51w5ZMC9+m8FM8xTlLCQysBhCP6NS1gm5jlE4MUuez1IpIBVDhMdCCqvYJug6IPuVsWcqXe1vSlBU/ukJ7G7cEAKJJQVN1lDfTlBYwayKo1MNVVouTP6am9vXtwdmlk7h/FQD6AWPa9ZZg7/mKNA8ak4owGsAD0wAAAIBGwBZtFBMnLmHL9CFYU3sbEdOKjI93+nmKn7NZfnat/mly+Oi7Y0XKYpYx0jIUJbKGPHIBFvHboGrxF2T1/AGnxhGckqf+5SLs4xq/tbJ7iv+Og7uEMF8FS3QwW2oi4ZyAbsbxeHdRwzUxXMgL839uhss2//337cm6oNr3CaoR+IBJEBjB0lj5LH39y5c/4IeI4axf7nRw7xXQJuSsUA2XIA4YNHg3AGY3deWUvfPcnP/AW1BQcSE1t4U4 [...] diff --git a/developers/davemds/id_ed25519.pub b/developers/davemds/id_ed25519.pub new file mode 100644 index 000..da91792 --- /dev/null +++ b/developers/davemds/id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 C3NzaC1lZDI1NTE5IHof4kuuZ1dZrKczSO+C4JUqIeXUaMegdJWViLa3iITY dave@mint --
[EGIT] [tools/edi] master 02/02: [tests] Correct checking of just length chars
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=ddfd8516357113ab9d041bdc9181b0f433669d17 commit ddfd8516357113ab9d041bdc9181b0f433669d17 Author: Andy Williams a...@andywilliams.me Date: Sat Aug 29 12:06:30 2015 +0100 [tests] Correct checking of just length chars Avoid traversing beyond string length --- elm_code/src/tests/elm_code_suite.h| 10 ++ elm_code/src/tests/widget/elm_code_test_widget_selection.c | 11 +++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/elm_code/src/tests/elm_code_suite.h b/elm_code/src/tests/elm_code_suite.h index 489e8fd..fddba5b 100644 --- a/elm_code/src/tests/elm_code_suite.h +++ b/elm_code/src/tests/elm_code_suite.h @@ -3,6 +3,16 @@ #include check.h +#define ck_assert_strn_eq(str1, str2, len) \ + { \ + unsigned int i = 0; \ + while (i len) \ + { \ + ck_assert_int_eq(*(str1 + i), *(str2 + i)); \ + i++; \ + } \ + } + #include Elm_Code.h void elm_code_file_test_load(TCase *tc); diff --git a/elm_code/src/tests/widget/elm_code_test_widget_selection.c b/elm_code/src/tests/widget/elm_code_test_widget_selection.c index bb52747..53d2f11 100644 --- a/elm_code/src/tests/widget/elm_code_test_widget_selection.c +++ b/elm_code/src/tests/widget/elm_code_test_widget_selection.c @@ -130,6 +130,7 @@ START_TEST (elm_code_test_widget_selection_delete) Elm_Code_Widget *widget; Evas_Object *win; const char *text; + unsigned int length; elm_init(1, NULL); code = elm_code_create(); @@ -139,16 +140,18 @@ START_TEST (elm_code_test_widget_selection_delete) win = elm_win_add(NULL, code, ELM_WIN_BASIC); widget = elm_code_widget_add(win, code); line = elm_code_file_line_get(file, 1); - text = elm_code_line_text_get(line, NULL); - ck_assert_str_eq(text, text); + text = elm_code_line_text_get(line, length); + ck_assert_int_eq(4, length); + ck_assert_strn_eq(text, text, length); elm_code_widget_selection_start(widget, 1, 2); elm_code_widget_selection_end(widget, 1, 3); elm_code_widget_selection_delete(widget); line = elm_code_file_line_get(file, 1); - text = elm_code_line_text_get(line, NULL); - ck_assert_str_eq(tt, text); + text = elm_code_line_text_get(line, length); + ck_assert_int_eq(2, length); + ck_assert_strn_eq(tt, text, length); elm_code_free(code); elm_shutdown(); --
[EGIT] [tools/edi] master 01/02: [elm_code] trim all trailing whitespace on save
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=0101b988d5b04ccd43f3746f686ecf5d368e81ae commit 0101b988d5b04ccd43f3746f686ecf5d368e81ae Author: Andy Williams a...@andywilliams.me Date: Sat Aug 29 12:05:56 2015 +0100 [elm_code] trim all trailing whitespace on save Rather than just blank lines remove all trailing whitespace from lines --- ChangeLog | 2 +- elm_code/src/lib/elm_code_file.c| 7 ++--- elm_code/src/lib/elm_code_text.c| 53 ++--- elm_code/src/lib/elm_code_text.h| 4 +++ elm_code/src/tests/elm_code_test_text.c | 19 5 files changed, 75 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd14aeb..b3e2fc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 2015-08-27 ajwillia.ms (Andy Williams) - * Trim lines that are purely whitespace during save + * Trim trailing whitespace from lines during save 2015-07-17 ajwillia.ms (Andy Williams) diff --git a/elm_code/src/lib/elm_code_file.c b/elm_code/src/lib/elm_code_file.c index 8832fe0..387e249 100644 --- a/elm_code/src/lib/elm_code_file.c +++ b/elm_code/src/lib/elm_code_file.c @@ -178,12 +178,9 @@ EAPI void elm_code_file_save(Elm_Code_File *file) EINA_LIST_FOREACH(file-lines, item, line_item) { +elm_code_line_text_trailing_whitespace_strip(line_item); content = elm_code_line_text_get(line_item, length); -if (elm_code_text_is_whitespace(content, length)) - { - length = 0; - elm_code_line_text_set(line_item, , 0); - } + fwrite(content, sizeof(char), length, out); fwrite(crchars, sizeof(char), crlength, out); } diff --git a/elm_code/src/lib/elm_code_text.c b/elm_code/src/lib/elm_code_text.c index 83216c6..abb5a69 100644 --- a/elm_code/src/lib/elm_code_text.c +++ b/elm_code/src/lib/elm_code_text.c @@ -24,19 +24,22 @@ EAPI void elm_code_line_text_set(Elm_Code_Line *line, const char *chars, unsigned int length) { Elm_Code_File *file; - char *newtext; + char *newtext, *oldtext = NULL; if (!line) return; if (line-modified) - free(line-modified); + oldtext = line-modified; newtext = malloc(sizeof(char) * length); strncpy(newtext, chars, length); line-modified = newtext; line-length = length; + if (oldtext) + free(oldtext); + file = line-file; if (file-parent) { @@ -207,6 +210,20 @@ elm_code_line_text_remove(Elm_Code_Line *line, unsigned int position, int length elm_code_callback_fire(file-parent, ELM_CODE_EVENT_LINE_LOAD_DONE, line); } +EAPI void elm_code_line_text_trailing_whitespace_strip(Elm_Code_Line *line) +{ + unsigned int length, trailing; + const char *content; + + content = elm_code_line_text_get(line, length); + trailing = elm_code_text_trailing_whitespace_length(content, length); + if (trailing == 0) + return; + + length -= trailing;; + elm_code_line_text_set(line, content, length); +} + /* generic text functions */ EAPI int @@ -238,6 +255,12 @@ elm_code_text_newlinenpos(const char *text, unsigned int length, short *nllen) return crpos; } +static Eina_Bool +_elm_code_text_char_is_whitespace(char c) +{ + return c == ' ' || c == '\t'; +} + EAPI unsigned int elm_code_text_leading_whitespace_length(const char *text, unsigned int length) { @@ -246,7 +269,7 @@ elm_code_text_leading_whitespace_length(const char *text, unsigned int length) while (count length) { -if (!(*ptr == ' ' || *ptr == '\t')) +if (!_elm_code_text_char_is_whitespace(*ptr)) break; count++; @@ -257,11 +280,33 @@ elm_code_text_leading_whitespace_length(const char *text, unsigned int length) } EAPI unsigned int +elm_code_text_trailing_whitespace_length(const char *text, unsigned int length) +{ + unsigned int count = 0; + char *ptr; + + if (length == 0) + return 0; + + ptr = (char *)text + length - 1; + while (count length) + { +if (!_elm_code_text_char_is_whitespace(*ptr)) + break; + +count++; +ptr--; + } + + return count; +} + +EAPI unsigned int elm_code_text_is_whitespace(const char *text, unsigned int length) { unsigned int leading; - leading = elm_code_text_leading_whitespace_length(text, length); + leading = elm_code_text_trailing_whitespace_length(text, length); return leading == length; } diff --git a/elm_code/src/lib/elm_code_text.h b/elm_code/src/lib/elm_code_text.h index 66bfbff..02d2cc4 100644 --- a/elm_code/src/lib/elm_code_text.h +++ b/elm_code/src/lib/elm_code_text.h @@ -36,6 +36,8 @@ EAPI void elm_code_line_text_insert(Elm_Code_Line *line, unsigned int position, EAPI void elm_code_line_text_remove(Elm_Code_Line *line, unsigned int position, int length); +EAPI void
[EGIT] [apps/terminology] master 01/01: fix tab selector segfault
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=ede0abb24582519d0b0012cb6e5e239def5d5a83 commit ede0abb24582519d0b0012cb6e5e239def5d5a83 Author: Boris Faure bill...@gmail.com Date: Sat Aug 29 15:23:50 2015 +0200 fix tab selector segfault Thanks to Yomi for the help in finding this --- src/bin/win.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/win.c b/src/bin/win.c index dc79fbf..57fc55b 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -1931,6 +1931,7 @@ _cb_tab_selector_show(Tabs *tabs, Tab_Item *to_item) is_selected = (tab_item == tabs-current); missed_bell = term-missed_bell; +tab_item-selector_entry = NULL; tab_item-selector_entry = sel_entry_add(tabs-selector, img, is_selected, missed_bell, wn-config); @@ -2275,7 +2276,8 @@ _tabs_swallow(Term_Container *tc, Term_Container *orig, evas_object_image_source_set(img, new_child-get_evas_object(new_child)); evas_object_data_set(img, tc, new_child); -sel_entry_update(tab_item-selector_entry); +if (tab_item-selector_entry) + sel_entry_update(tab_item-selector_entry); } else if (tab_item != tabs-current) { @@ -2471,7 +2473,7 @@ _tabs_set_title(Term_Container *tc, Term_Container *child, assert(l); tab_item = l-data; - if (tabs-selector) + if (tabs-selector tab_item-selector_entry) { sel_entry_title_set(tab_item-selector_entry, title); } --
[EGIT] [tools/edi] master 02/03: [editor] Make whitespace trimming an option
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=2f0347b1085698bb259cc3b5267dbd4afdc822af commit 2f0347b1085698bb259cc3b5267dbd4afdc822af Author: Andy Williams a...@andywilliams.me Date: Sat Aug 29 14:46:18 2015 +0100 [editor] Make whitespace trimming an option Add a global setting to turn off the behaviour --- elm_code/src/lib/elm_code_common.h | 7 +++ elm_code/src/lib/elm_code_file.c | 5 - src/bin/edi_config.c | 2 ++ src/bin/edi_config.h | 1 + src/bin/editor/edi_editor.c| 5 + src/bin/screens/edi_settings.c | 20 6 files changed, 39 insertions(+), 1 deletion(-) diff --git a/elm_code/src/lib/elm_code_common.h b/elm_code/src/lib/elm_code_common.h index 9c8ec5a..5efe685 100644 --- a/elm_code/src/lib/elm_code_common.h +++ b/elm_code/src/lib/elm_code_common.h @@ -61,11 +61,18 @@ extern C { * @brief Common data structures and constants. */ +struct _Elm_Code_Config +{ + Eina_Bool trim_whitespace; +}; + struct _Elm_Code { Elm_Code_File *file; Eina_List *widgets; Eina_List *parsers; + + struct _Elm_Code_Config config; }; /** diff --git a/elm_code/src/lib/elm_code_file.c b/elm_code/src/lib/elm_code_file.c index 07ff643..5db1bfa 100644 --- a/elm_code/src/lib/elm_code_file.c +++ b/elm_code/src/lib/elm_code_file.c @@ -158,6 +158,7 @@ EAPI Elm_Code_File *elm_code_file_open(Elm_Code *code, const char *path) EAPI void elm_code_file_save(Elm_Code_File *file) { Eina_List *item; + Elm_Code *code; Elm_Code_Line *line_item; const char *path, *content, *crchars; char *tmp; @@ -165,6 +166,7 @@ EAPI void elm_code_file_save(Elm_Code_File *file) short crlength; FILE *out; + code = file-parent; path = elm_code_file_path_get(file); tmp = _elm_code_file_tmp_path_get(file); crchars = elm_code_file_line_ending_chars_get(file, crlength); @@ -178,7 +180,8 @@ EAPI void elm_code_file_save(Elm_Code_File *file) EINA_LIST_FOREACH(file-lines, item, line_item) { -if (!elm_code_line_contains_widget_cursor(line_item)) +if (code code-config.trim_whitespace +!elm_code_line_contains_widget_cursor(line_item)) elm_code_line_text_trailing_whitespace_strip(line_item); content = elm_code_line_text_get(line_item, length); diff --git a/src/bin/edi_config.c b/src/bin/edi_config.c index 3153640..19c3404 100644 --- a/src/bin/edi_config.c +++ b/src/bin/edi_config.c @@ -217,6 +217,7 @@ _edi_config_init(void) #define D _edi_cfg_edd EDI_CONFIG_VAL(D, T, version, EET_T_INT); EDI_CONFIG_VAL(D, T, autosave, EET_T_UCHAR); + EDI_CONFIG_VAL(D, T, trim_whitespace, EET_T_UCHAR); EDI_CONFIG_LIST(D, T, projects, _edi_cfg_proj_edd); EDI_CONFIG_LIST(D, T, mime_assocs, _edi_cfg_mime_edd); @@ -317,6 +318,7 @@ _edi_config_load(void) IFCFG(0x000c); _edi_config-autosave = EINA_TRUE; + _edi_config-trim_whitespace = EINA_TRUE; _edi_config-projects = NULL; _edi_config-mime_assocs = NULL; IFCFGEND; diff --git a/src/bin/edi_config.h b/src/bin/edi_config.h index e93f1ec..f880ca7 100644 --- a/src/bin/edi_config.h +++ b/src/bin/edi_config.h @@ -39,6 +39,7 @@ struct _Edi_Config int version; Eina_Bool autosave; + Eina_Bool trim_whitespace; Eina_List *projects; Eina_List *mime_assocs; diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c index 699c29f..e9d2fda 100644 --- a/src/bin/editor/edi_editor.c +++ b/src/bin/editor/edi_editor.c @@ -572,8 +572,13 @@ static Eina_Bool _edi_editor_config_changed(void *data, int type EINA_UNUSED, void *event EINA_UNUSED) { Elm_Code_Widget *widget; + Elm_Code *code; widget = (Elm_Code_Widget *) data; + code = elm_code_widget_code_get(widget); + + code-config.trim_whitespace = _edi_config-trim_whitespace; + eo_do(widget, elm_obj_code_widget_font_set(_edi_project_config-font.name, _edi_project_config-font.size), elm_obj_code_widget_show_whitespace_set(_edi_project_config-gui.show_whitespace), diff --git a/src/bin/screens/edi_settings.c b/src/bin/screens/edi_settings.c index f510ac0..24b3362 100644 --- a/src/bin/screens/edi_settings.c +++ b/src/bin/screens/edi_settings.c @@ -352,6 +352,17 @@ _edi_settings_behaviour_autosave_cb(void *data EINA_UNUSED, Evas_Object *obj, _edi_config_save(); } +static void +_edi_settings_behaviour_trim_whitespace_cb(void *data EINA_UNUSED, Evas_Object *obj, + void *event EINA_UNUSED) +{ + Evas_Object *check; + + check = (Evas_Object *)obj; + _edi_config-trim_whitespace = elm_check_state_get(check); + _edi_config_save(); +} + static Evas_Object * _edi_settings_behaviour_create(Evas_Object *parent) { @@ -369,6 +380,15 @@ _edi_settings_behaviour_create(Evas_Object *parent) _edi_settings_behaviour_autosave_cb, NULL);
[EGIT] [tools/edi] master 03/03: [create] use /bin/sh to execute the sed script
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=35154d8d54daf60f63ac8e97825c9d2ed6b8b5f5 commit 35154d8d54daf60f63ac8e97825c9d2ed6b8b5f5 Author: Andy Williams a...@andywilliams.me Date: Sat Aug 29 15:45:41 2015 +0100 [create] use /bin/sh to execute the sed script Attempting to fix github issue #3 --- src/lib/edi_create.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/edi_create.c b/src/lib/edi_create.c index 114d089..4ff636f 100644 --- a/src/lib/edi_create.c +++ b/src/lib/edi_create.c @@ -82,7 +82,7 @@ _edi_create_filter_file(Edi_Create *create, const char *path) create-filters++; // TODO speed this up - pre-cache this filter! - template = sed -i \s|\\${edi_name}|%s|g;s|\\${Edi_Name}|%s|g;s|\\${EDI_NAME}|%s|g;s|\\${Edi_User}|%s|ig;s|\\${Edi_Email}|%s|g;s|\\${Edi_Url}|$%s|g;s|\\${Edi_Year}|%d|g\ %s; + template = sh -c \sed -i 's|\\${edi_name}|%s|g;s|\\${Edi_Name}|%s|g;s|\\${EDI_NAME}|%s|g;s|\\${Edi_User}|%s|ig;s|\\${Edi_Email}|%s|g;s|\\${Edi_Url}|$%s|g;s|\\${Edi_Year}|%d|g' %s\; length = strlen(template) + (strlen(create-name) * 3) + strlen(create-user) + strlen(create-email) + strlen(create-url) + strlen(path) + 4 - 16 + 1; lowername = strdup(create-name); @@ -174,7 +174,7 @@ _edi_create_move_done_cb(void *data, Eio_File *file EINA_UNUSED) static void _edi_create_move_error_cb(void *data, Eio_File *handler EINA_UNUSED, int error) { - ERR(move error for %s: [%s]\n, (char *) data, strerror(error)); + WRN(move error for %s: [%s]\n, (char *) data, strerror(error)); // This matches the filtered path copy created in the copy callback free(data); --
[EGIT] [tools/edi] master 01/03: [settings] Fix typo causing compile error
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=fdd2a6933350286bb0d4a84769f88e9a120e48ba commit fdd2a6933350286bb0d4a84769f88e9a120e48ba Author: Andy Williams a...@andywilliams.me Date: Sat Aug 29 14:16:53 2015 +0100 [settings] Fix typo causing compile error Fixes github issue #4 --- src/bin/screens/edi_settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/screens/edi_settings.c b/src/bin/screens/edi_settings.c index 322e851..f510ac0 100644 --- a/src/bin/screens/edi_settings.c +++ b/src/bin/screens/edi_settings.c @@ -207,7 +207,7 @@ _edi_settings_display_create(Evas_Object *parent) label = elm_label_add(hbox); elm_object_text_set(label, Tabstop); - evas_object_size_hint_align_set(label, 0.0D, 0.5); + evas_object_size_hint_align_set(label, 0.0, 0.5); elm_box_pack_end(hbox, label); evas_object_show(label); --
[EGIT] [tools/edi] master 01/01: prep for release of 0.1
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=fa4cca051d7af92f9fe94877354bbf9334412168 commit fa4cca051d7af92f9fe94877354bbf9334412168 Author: Andy Williams a...@andywilliams.me Date: Sat Aug 29 16:11:12 2015 +0100 prep for release of 0.1 --- NEWS | 11 +++ configure.ac | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index c41be3b..707405c 100644 --- a/NEWS +++ b/NEWS @@ -4,15 +4,26 @@ Edi 0.1 Features: + * New icon :) * Integrated elm_code editor - faster code highlighting - highlighting of error lines +- highlighting of TODO lines - line width indicator in the editor - configurable tab stop width + * Add a main menu and tidy up toolbar + * Remember UI settings per project + * Add launch configuration so we can run a built binary + * Added a monospaced font picker to settings + * Indent newlines to match whitespace in the previous line + * Trim trailing whitespace when saving + Bug fixes * T2057 Line numbers are not fully visible in new windows + * #3 assume bash as default shell when creating a new project + * #4 Unable to compile 0.0.2 diff --git a/configure.ac b/configure.ac index 7740ead..4cf9835 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFL_VERSION([0], [0], [9]) +EFL_VERSION([0], [1], [0]) AC_INIT([edi], [efl_version], [enlightenment-de...@lists.sourceforge.net]) AC_PREREQ([2.65]) --
[EGIT] [admin/devs] master 04/06: Re-arrange which buildable is in which group, plus add some.
onefang pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=dfb5d9db757a922cd702495bbe43d1eed1a4d118 commit dfb5d9db757a922cd702495bbe43d1eed1a4d118 Author: David Walter Seikel won_f...@yahoo.com.au Date: Sun Aug 30 12:40:54 2015 +1000 Re-arrange which buildable is in which group, plus add some. --- developers/onefang/build_efl.lua | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/developers/onefang/build_efl.lua b/developers/onefang/build_efl.lua index 2d15fa5..9151bb4 100755 --- a/developers/onefang/build_efl.lua +++ b/developers/onefang/build_efl.lua @@ -69,27 +69,27 @@ local eflExtra = { 'imlib2', 'imlib2_loaders', 'emap', 'azy', 'enlil', 'libast', 'libeweather', 'e_dbus', -- Legacy, but building it anyway, some things might still depend on it. -'egraph', 'ekbd', 'elev8', 'elocation', 'email', 'epdf', 'eupnp', 'efx', 'esskyuehl', 'etam', 'etrophy', +'egraph', 'ekbd', 'elev8', 'elocation', 'email', 'epdf', 'eupnp', 'efx', 'esskyuehl', 'etam', 'etrophy', 'ewe', 'ffi-efl', --[['python-evas', 'python-ecore', 'python-e_dbus', 'python-edje', 'python-ethumb', 'python-emotion', 'python-elementary' Legacy bindings.]] 'python-efl' --[[ Ubuntu LTS cython is too old.]] } -local binBasic = {'exchange', 'enlightenment', 'exalt', 'emprint', 'geneet'} +local binBasic = {'exchange', 'enlightenment', 'entrance', 'exalt', 'emprint', 'geneet', 'terminology'} local eModulesExtra = {} local binExtra = { 'amnesia', 'apathy', 'ardy', 'calculator', 'clouseau', 'community', 'converter', 'e_cho', 'e_jeweled', 'e_pattern_lock', 'econcentration', 'econnman', 'ecrire', 'editje', 'edje_list', 'edje_smart_thumb', 'edje_viewer', 'edi', 'edje_writer', --[['edvi', No dvilib2 in Ubuntu LTS.]] -'efbb', 'egui', 'ekeko', 'elemines', 'elife', -'elm_fullscreen', 'elm_illume', 'elm_indicator', 'elm_kbd', 'elm_quickpanel', 'elm_softkey', 'elm-theme-viewer', 'elmdentica', 'embiance', 'emote', 'empower', 'encrustify', +'efbb', 'eflete', 'egui', 'ekeko', 'elemines', 'elife', +'elm_fullscreen', 'elm_illume', 'elm_indicator', 'elm_kbd', 'elm_quickpanel', 'elm_softkey', 'elm-theme-viewer', 'elmdentica', 'embiance', 'emote', 'empower', 'ecrustify', --[['enjoy', No lightmediascanner in Ubuntu LTS.]] -'enki', 'ensure', 'entrance', 'enventor', 'eo_bindings', 'eo_tokenizer', 'eolian', +'enki', 'ensure', 'enventor', 'eo_bindings', 'eo_tokenizer', 'eolian', --[['envision', Hangs waiting for input.]] -'ephoto', 'ephysics_tests', 'epour', 'eps', 'epulse', 'equate', 'erssd', 'eruler', 'eskiss', 'espik', 'espionnage', 'etypers', 'eterm', 'ev', +'ephoto', 'ephysics_tests', 'epour', 'eps', 'epulse', 'equate', 'erssd', 'eruler', 'eskiss', 'espik', 'espionnage', 'etypers', 'eterm', 'ev', 'evas-3d-elm', --[['eve', No ewebkit. The release of webkit-efl in turn requires GLIB 2.36.0, Ubuntu LTS has only 2.32.4 Not going down that rabbit hole again.]] 'exactness', 'examine', 'excessive', 'expedite', 'explicit', 'exquisite', 'eyelight', 'eyelight_edit', 'eyesight', -'gpick', 'keys', 'maelstrom', 'ninestime', 'phonebook', 'rage', 'shellementary', 'smman', 'solve', 'sticky-notes', 'terminology', 'valosoitin', 'vigrid' +'gpick', 'keys', 'maelstrom', 'ninestime', 'phonebook', 'rage', 'shellementary', 'smman', 'solve', 'sticky-notes', 'valosoitin', 'vigrid' } local eThemes = {} --
[EGIT] [admin/devs] master 05/06: Various changes to the configure options.
onefang pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=2ac4af0726832a59171ee734e89f30de8a289d91 commit 2ac4af0726832a59171ee734e89f30de8a289d91 Author: David Walter Seikel won_f...@yahoo.com.au Date: Sun Aug 30 12:41:26 2015 +1000 Various changes to the configure options. --- developers/onefang/build_efl.lua | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/developers/onefang/build_efl.lua b/developers/onefang/build_efl.lua index 9151bb4..484a721 100755 --- a/developers/onefang/build_efl.lua +++ b/developers/onefang/build_efl.lua @@ -94,11 +94,14 @@ local binExtra = local eThemes = {} local configOptions = -{ -efl = ' --enable-xinput22 --enable-multisense --disable-gstreamer1 --enable-lua-old --enable-gstreamer --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa', ---efl = ' --enable-xinput22 --enable-multisense --disable-gstreamer1 --enable-gstreamer --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa', --- Left out --enable-systemd --enable-harfbuzz --enable-wayland --disable-tslib --enable-fb --enable-image-loader-webp +{ -- --enable-image-loader-jp2k (Needs openjp2 ,which is not in Ubuntu LTS.) --enable-image-loader-webp (Currently borked.) --enable-image-loader-tgv (Currently borked.) +--efl = '--enable-xinput22 --enable-multisense --enable-fb --enable-valgrind --enable-xine --disable-gstreamer1 --enable-gstreamer --enable-lua-old --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba', +-- --enable-always-build-examples +efl = '--enable-xine --disable-gstreamer1 --enable-gstreamer --enable-lua-old --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba', +--efl = '--enable-xinput22 --enable-multisense --disable-gstreamer1 --enable-gstreamer --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa', +-- Left out --enable-systemd --enable-harfbuzz --enable-wayland --disable-tslib --enable-fb --enable-image-loader-webp --enable-always-build-examples -- The moment I saw --enable-i-really-know-what-i-am-doing-... hit git, I knew I'd end up using it. Coz apparently the stable version of the worlds most popular Linux distro isn't important to support. +--elementary = '--enable-build-examples --enable-install-examples', } local exportedEnvVars = '' --
[EGIT] [admin/devs] master 06/06: Remove SVN stuff that is long been obsolete.
onefang pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=e899eecdc9889e460e80b5eccec2dfb83bc3ae8c commit e899eecdc9889e460e80b5eccec2dfb83bc3ae8c Author: David Walter Seikel won_f...@yahoo.com.au Date: Sun Aug 30 12:41:58 2015 +1000 Remove SVN stuff that is long been obsolete. --- developers/onefang/build_efl.lua | 6 -- 1 file changed, 6 deletions(-) diff --git a/developers/onefang/build_efl.lua b/developers/onefang/build_efl.lua index 484a721..a4fcf00 100755 --- a/developers/onefang/build_efl.lua +++ b/developers/onefang/build_efl.lua @@ -252,12 +252,6 @@ if nil ~= arg[1] then end else ---[[ SVN is no longer used. -printf(Updating SVN, this might take a while.\n) --- TODO - Should do a check out if it does not exist, like git does below. -os.execute(saEnvVars .. 'cd SVN svn update --accept theirs-conflict 21 | tee /tmp/eflBuild/subversion.log') -os.execute('sudo echo ')-- Just tickle the sudo so it remembers, in case the SVN took too long. -]]-- printf(Updating git, this might take a while.\n) for line in io.lines('/tmp/eflBuild/repos_sorted.txt') do local path = string.sub(line, 1, -5) --
[EGIT] [admin/devs] master 01/06: Move where I build EFL.
onefang pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=84f9118c70742104c2128c0734b6adcce5f717f0 commit 84f9118c70742104c2128c0734b6adcce5f717f0 Author: David Walter Seikel won_f...@yahoo.com.au Date: Sun Aug 30 12:37:34 2015 +1000 Move where I build EFL. --- developers/onefang/build_efl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developers/onefang/build_efl.lua b/developers/onefang/build_efl.lua index c495228..10e5906 100755 --- a/developers/onefang/build_efl.lua +++ b/developers/onefang/build_efl.lua @@ -43,7 +43,7 @@ setmetatable(getfenv(), {__index = f}) -- TODO - Should get these out of a config lua script, but keep these as defaults. -local installPath = '/opt/e17' +local installPath = '/opt/EFL' local cythonPath = PWD .. '/cython' local threads = 5 local envVars = --
[EGIT] [admin/devs] master 03/06: Support my own Lua build system.
onefang pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=d40c0fe86b822e8866b38273d131fed1a3e97a67 commit d40c0fe86b822e8866b38273d131fed1a3e97a67 Author: David Walter Seikel won_f...@yahoo.com.au Date: Sun Aug 30 12:39:54 2015 +1000 Support my own Lua build system. --- developers/onefang/build_efl.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/developers/onefang/build_efl.lua b/developers/onefang/build_efl.lua index b8b435e..2d15fa5 100755 --- a/developers/onefang/build_efl.lua +++ b/developers/onefang/build_efl.lua @@ -149,6 +149,8 @@ local function build(i, package) if good then good = runBuildCommand(i, package, path, './autogen.sh --prefix=' .. installPath .. ' --cache-file=/tmp/eflBuild/autofoo.cache ' .. conf) end if good then good = runBuildCommand(i, package, path, 'make -j' .. threads) end if good then good = runBuildCommand(i, package, path, 'sudo make install') end + elseif fileExists(path .. '/build.lua') then + if good then good = runBuildCommand(i, package, path, './build.lua') end elseif fileExists(path .. '/build.sh') then if good then good = runBuildCommand(i, package, path, './build.sh') end elseif fileExists(path .. '/bootstrap.sh') then --
[EGIT] [admin/devs] master 02/06: Make sure there's a space before the extra configuration on the command line.
onefang pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=52b3dd45b7dfe2b9ac7f7c55069f020a21b3d870 commit 52b3dd45b7dfe2b9ac7f7c55069f020a21b3d870 Author: David Walter Seikel won_f...@yahoo.com.au Date: Sun Aug 30 12:39:27 2015 +1000 Make sure there's a space before the extra configuration on the command line. --- developers/onefang/build_efl.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/developers/onefang/build_efl.lua b/developers/onefang/build_efl.lua index 10e5906..b8b435e 100755 --- a/developers/onefang/build_efl.lua +++ b/developers/onefang/build_efl.lua @@ -146,14 +146,14 @@ local function build(i, package) end if fileExists(path .. '/autogen.sh') then - if good then good = runBuildCommand(i, package, path, './autogen.sh --prefix=' .. installPath .. ' --cache-file=/tmp/eflBuild/autofoo.cache' .. conf) end + if good then good = runBuildCommand(i, package, path, './autogen.sh --prefix=' .. installPath .. ' --cache-file=/tmp/eflBuild/autofoo.cache ' .. conf) end if good then good = runBuildCommand(i, package, path, 'make -j' .. threads) end if good then good = runBuildCommand(i, package, path, 'sudo make install') end elseif fileExists(path .. '/build.sh') then if good then good = runBuildCommand(i, package, path, './build.sh') end elseif fileExists(path .. '/bootstrap.sh') then if good then good = runBuildCommand(i, package, path, './bootstrap.sh') end - if good then good = runBuildCommand(i, package, path, './configure --prefix=' .. installPath .. ' --cache-file=/tmp/eflBuild/autofoo.cache' .. conf) end + if good then good = runBuildCommand(i, package, path, './configure --prefix=' .. installPath .. ' --cache-file=/tmp/eflBuild/autofoo.cache ' .. conf) end if good then good = runBuildCommand(i, package, path, 'make -j' .. threads) end if good then good = runBuildCommand(i, package, path, 'sudo make install') end elseif fileExists(path .. '/Makefile.PL') then --
[EGIT] [admin/devs] master 02/02: Remove my DSA key.
onefang pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=31b345cc2097e5963347d31fe6890853c480166c commit 31b345cc2097e5963347d31fe6890853c480166c Author: David Walter Seikel won_f...@yahoo.com.au Date: Sun Aug 30 12:33:31 2015 +1000 Remove my DSA key. --- developers/onefang/id_dsa.pub | 1 - 1 file changed, 1 deletion(-) diff --git a/developers/onefang/id_dsa.pub b/developers/onefang/id_dsa.pub deleted file mode 100644 index 91ff2a6..000 --- a/developers/onefang/id_dsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss B3NzaC1kc3MAAACBAL6gw12kgEFeJypOx6bjUeFb1DK+SkAJcXyj6QxxVhFtWPwetTATHLsmnYQjW/I/2OSRyWicaO/batGWew+JZSXvxqXzimKUkoQzSS+0zM8iNcK/wJqJR6R5gnoEXJCO72u1CdMsH7LGaYI2LJ1SajHtPxjU45yC7zmuP6+CXVXXFQD2yph8tlTSC6UDczdDHvN4yipTyQAAAIEAnqDtj0hnD0ahz9AEo/P5qPJE7hB5+7yW9Dvk/ia5kSmZOmaHCgF9N7fcCCX4U6JTUSEON6/x1uHiUgCcXdanwmmq392d3kmHTTIaf4d9YudZ9HOJ6yA+J48CkLtlYoZNYKmX6VH0QQg+D3Kbag6KBl6jPLljXc2ZxRRZwpUehSsAAACAMlNrA7E+bYebWTgXFgoJ51WZdZ4OKkhOsXL53FASQ9Bn1Q/1XUiJSHyuoXrmDtKwagtpZ1GsTcSv [...] --
[EGIT] [admin/devs] master 01/02: Remove old web site that no longer exists.
onefang pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=e90acb0d7dd226f0c49544542cc5502339a32de7 commit e90acb0d7dd226f0c49544542cc5502339a32de7 Author: David Walter Seikel won_f...@yahoo.com.au Date: Sun Aug 30 12:33:16 2015 +1000 Remove old web site that no longer exists. --- developers/onefang/info.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/developers/onefang/info.txt b/developers/onefang/info.txt index a01f83a..c0da258 100644 --- a/developers/onefang/info.txt +++ b/developers/onefang/info.txt @@ -3,9 +3,7 @@ IRC Nick: onefang Name: David Walter Seikel Location: Brisbane, Australia E-Mail: -onef...@gmail.com -WWW: http://onefang.net/ Contributing: e, ecore_exe, edje Group:Core, Libraries Platform: Ubuntu (Linux), Aboriginal (Linux) GeoData: -27.5 153.02 - --
[EGIT] [admin/devs] master 01/01: Adding my RSA key.
onefang pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=283ff890afb0a17185e7daea3afcb25096719bba commit 283ff890afb0a17185e7daea3afcb25096719bba Author: David Walter Seikel won_f...@yahoo.com.au Date: Sun Aug 30 12:20:27 2015 +1000 Adding my RSA key. --- developers/onefang/id_rsa.pub | 1 + 1 file changed, 1 insertion(+) diff --git a/developers/onefang/id_rsa.pub b/developers/onefang/id_rsa.pub new file mode 100644 index 000..46752b7 --- /dev/null +++ b/developers/onefang/id_rsa.pub @@ -0,0 +1 @@ +ssh-rsa B3NzaC1yc2EDAQABAAACAQDKqdk6dBLwd2WunuhQuWGj3CRs2x+8pjlUbiTacp5wf4VOb/EGxLBkAMc2E1y9QYzFqWcqeg8RxW0rrjZ57LST4j2nAl6CVdM3GA3ZkngR3DyDltuwvFwGShbunhK0xebirIvIm68C7z5CaSnq5+HHQQuGd4elRNWHJUgJmBVHW1VOCzqw/wTNz9udkFbUOPujV2smsPe6yMkhNESnZKfhL918YowRhYnHSCHZ1Qer4wJwdaT+yIiV5ux3cgd+zsxMiHnFX8WtGTwVyTRlyKF8HiDQ8GaMJoUiS/uLWQ5LuNx0nUQzsQJZy6YOgGIC7xZzwngD1uWT3s1bZU5uIelwpjuv/2DFcowNGzsOAusizBkWL1rGt1OiLD0NpOqIyvLN2+KLTXH0VTzT+4iOQJS8NYeu9fJNqv1cztJqcEDOTR2WZHxOmlzvpVzdux250okG42Km [...] --
[EGIT] [tools/edi] master 01/01: Fix make distcheck
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=dafda92c8e7085812ddc3cab1d33ab2c47b442fa commit dafda92c8e7085812ddc3cab1d33ab2c47b442fa Author: Andy Williams a...@andywilliams.me Date: Sat Aug 29 20:56:22 2015 +0100 Fix make distcheck --- configure.ac| 1 + elm_code/src/lib/Makefile.am| 9 + elm_code/src/lib/widget/Makefile.am | 0 elm_code/src/tests/Makefile.am | 5 - 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4cf9835..218b6a5 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,7 @@ 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 diff --git a/elm_code/src/lib/Makefile.am b/elm_code/src/lib/Makefile.am index 087f863..95129e8 100644 --- a/elm_code/src/lib/Makefile.am +++ b/elm_code/src/lib/Makefile.am @@ -1,5 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in +SUBDIRS = widget + CLEANFILES= EOLIAN_FLAGS = @DEPS_EOLIAN_FLAGS@ \ @@ -9,6 +11,9 @@ 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 \ @@ -25,6 +30,7 @@ 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 @@ -62,3 +68,6 @@ BUILT_SOURCES = \ elmcodeeolianfilesdir = $(datadir)/eolian/include/elm_code-@VMAJ@ elmcodeeolianfiles_DATA = $(elm_code_eolian_files) EXTRA_DIST = ${elmcodeeolianfiles_DATA} + +CLEANFILES += $(elm_code_eolian_h) $(elm_code_eolian_legacy_h) + diff --git a/elm_code/src/lib/widget/Makefile.am b/elm_code/src/lib/widget/Makefile.am new file mode 100644 index 000..e69de29 diff --git a/elm_code/src/tests/Makefile.am b/elm_code/src/tests/Makefile.am index 86acce2..6256c35 100644 --- a/elm_code/src/tests/Makefile.am +++ b/elm_code/src/tests/Makefile.am @@ -17,10 +17,13 @@ widget/elm_code_test_widget_text.c \ widget/elm_code_test_widget_selection.c \ elm_code_suite.c -elm_code_suite_CPPFLAGS = -I$(top_builddir)/elm_code/src/lib/ \ +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/\ \ --
[EGIT] [tools/edi] master 01/01: Fix NEWS file to respect the 0.0.9 release
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=ee58982b8faaf77ba633a74a1b07b59c3c2af508 commit ee58982b8faaf77ba633a74a1b07b59c3c2af508 Author: Andy Williams a...@andywilliams.me Date: Sun Aug 30 01:11:42 2015 +0100 Fix NEWS file to respect the 0.0.9 release --- NEWS | 25 +++-- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 707405c..9f69691 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,20 @@ Edi 0.1 Features: + * Added a monospaced font picker to settings + * Indent newlines to match whitespace in the previous line + * Trim trailing whitespace when saving + +Bug fixes + + * T2057 Line numbers are not fully visible in new windows + * #3 assume bash as default shell when creating a new project + * #4 Unable to compile + + +0.0.9 +- + * New icon :) * Integrated elm_code editor - faster code highlighting @@ -11,19 +25,10 @@ Features: - highlighting of TODO lines - line width indicator in the editor - configurable tab stop width + * Add a main menu and tidy up toolbar * Remember UI settings per project * Add launch configuration so we can run a built binary - * Added a monospaced font picker to settings - * Indent newlines to match whitespace in the previous line - * Trim trailing whitespace when saving - - -Bug fixes - - * T2057 Line numbers are not fully visible in new windows - * #3 assume bash as default shell when creating a new project - * #4 Unable to compile 0.0.2 --