vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge build fixes from 'arcpatch-D4917'

This commit is contained in:
Andy Williams 2017-06-25 09:17:16 +01:00
parent 9677bb4b86 792ca745e7
commit c608163e31
6 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/edi_build_main.c
View File

@ -155,7 +155,8 @@ main(int argc, char **argv)
goto end;
}
getcwd(path, PATH_MAX);
if (!getcwd(path, PATH_MAX))
goto end;
edi_project_set(path);
if (args < argc)

4
src/bin/edi_consolepanel.c
View File

@ -230,7 +230,9 @@ _edi_test_line_parse_suite(const char *path)
pathlength = strlen(path);
snprintf(logfile, pathlength + 4 + 1, "%s.log", path);
realpath(logfile, logpath);
if (!realpath(logfile, logpath))
ERR("Log file not found: %s", logfile);
if (_current_test_dir)
eina_stringshare_del(_current_test_dir);
_current_test_dir = eina_stringshare_add(dirname(logpath));

6
src/bin/edi_debugpanel.c
View File

@ -209,8 +209,9 @@ _edi_debug_process_id(int *state)
snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
f = fopen(path, "r");
if (!f) continue;
fgets(buf, sizeof(buf), f);
p = fgets(buf, sizeof(buf), f);
fclose(f);
if (!p) continue;
temp_name = ecore_file_file_get(buf);
if (!strcmp(temp_name, program_name))
{
@ -222,8 +223,7 @@ _edi_debug_process_id(int *state)
if (f)
{
count = 0;
fgets(buf, sizeof(buf), f);
p = buf;
p = fgets(buf, sizeof(buf), f);
while (*p++ != '\0')
{
if (p[0] == ' ') { count++; p++; }

9
src/lib/edi_build_provider_cmake.c
View File

@ -40,7 +40,8 @@ _cmake_file_hidden_is(const char *file)
static void
_cmake_build(void)
{
chdir(edi_project_get());
if (chdir(edi_project_get()) != 0)
ERR("Could not chdir");
ecore_exe_pipe_run("mkdir -p build && cd build && cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 .. && make && cd ..",
ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
@ -50,7 +51,8 @@ _cmake_build(void)
static void
_cmake_test(void)
{
chdir(edi_project_get());
if (chdir(edi_project_get()) != 0)
ERR("Could not chdir");
ecore_exe_pipe_run("env CK_VERBOSITY=verbose make check", 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, NULL);
@ -59,7 +61,8 @@ _cmake_test(void)
static void
_cmake_clean(void)
{
chdir(edi_project_get());
if (chdir(edi_project_get()) != 0)
ERR("Could not chdir");
ecore_exe_pipe_run("make clean", 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, NULL);

14
src/lib/edi_build_provider_make.c
View File

@ -47,7 +47,8 @@ _make_file_hidden_is(const char *file)
static void
_make_build_make(void)
{
chdir(edi_project_get());
if (chdir(edi_project_get()) != 0)
ERR("Could not chdir");
ecore_exe_pipe_run(BEAR_COMMAND MAKE_COMMAND, 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, NULL);
@ -56,7 +57,8 @@ _make_build_make(void)
static void
_make_build_configure(void)
{
chdir(edi_project_get());
if (chdir(edi_project_get()) != 0)
ERR("Could not chdir");
ecore_exe_pipe_run("./configure && " BEAR_COMMAND MAKE_COMMAND,
ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
@ -66,7 +68,8 @@ _make_build_configure(void)
static void
_make_build_autogen(void)
{
chdir(edi_project_get());
if (chdir(edi_project_get()) != 0)
ERR("Could not chdir");
ecore_exe_pipe_run("./autogen.sh && " BEAR_COMMAND MAKE_COMMAND,
ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
@ -87,6 +90,8 @@ _make_build(void)
static void
_make_test(void)
{
if (chdir(edi_project_get()) != 0)
ERR("Could not chdir");
chdir(edi_project_get());
ecore_exe_pipe_run("env CK_VERBOSITY=verbose" MAKE_COMMAND " check", ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
@ -96,7 +101,8 @@ _make_test(void)
static void
_make_clean(void)
{
chdir(edi_project_get());
if (chdir(edi_project_get()) !=0)
ERR("Could not chdir");
ecore_exe_pipe_run("make clean", 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, NULL);

3
src/lib/edi_create.c
View File

@ -162,7 +162,8 @@ _edi_create_filter_file_done(void *data, int type EINA_UNUSED, void *event EINA_
handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _edi_create_project_done, data);
create->handler = handler;
chdir(create->path);
if (chdir(create->path) != 0)
ERR("Could not chdir");
command = eina_strbuf_new();