forked from enlightenment/edi
Merge build fixes from 'arcpatch-D4917'
This commit is contained in:
commit
c608163e31
|
@ -155,7 +155,8 @@ main(int argc, char **argv)
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
getcwd(path, PATH_MAX);
|
if (!getcwd(path, PATH_MAX))
|
||||||
|
goto end;
|
||||||
edi_project_set(path);
|
edi_project_set(path);
|
||||||
|
|
||||||
if (args < argc)
|
if (args < argc)
|
||||||
|
|
|
@ -230,7 +230,9 @@ _edi_test_line_parse_suite(const char *path)
|
||||||
|
|
||||||
pathlength = strlen(path);
|
pathlength = strlen(path);
|
||||||
snprintf(logfile, pathlength + 4 + 1, "%s.log", 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)
|
if (_current_test_dir)
|
||||||
eina_stringshare_del(_current_test_dir);
|
eina_stringshare_del(_current_test_dir);
|
||||||
_current_test_dir = eina_stringshare_add(dirname(logpath));
|
_current_test_dir = eina_stringshare_add(dirname(logpath));
|
||||||
|
|
|
@ -209,8 +209,9 @@ _edi_debug_process_id(int *state)
|
||||||
snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
|
snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
|
||||||
f = fopen(path, "r");
|
f = fopen(path, "r");
|
||||||
if (!f) continue;
|
if (!f) continue;
|
||||||
fgets(buf, sizeof(buf), f);
|
p = fgets(buf, sizeof(buf), f);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
if (!p) continue;
|
||||||
temp_name = ecore_file_file_get(buf);
|
temp_name = ecore_file_file_get(buf);
|
||||||
if (!strcmp(temp_name, program_name))
|
if (!strcmp(temp_name, program_name))
|
||||||
{
|
{
|
||||||
|
@ -222,8 +223,7 @@ _edi_debug_process_id(int *state)
|
||||||
if (f)
|
if (f)
|
||||||
{
|
{
|
||||||
count = 0;
|
count = 0;
|
||||||
fgets(buf, sizeof(buf), f);
|
p = fgets(buf, sizeof(buf), f);
|
||||||
p = buf;
|
|
||||||
while (*p++ != '\0')
|
while (*p++ != '\0')
|
||||||
{
|
{
|
||||||
if (p[0] == ' ') { count++; p++; }
|
if (p[0] == ' ') { count++; p++; }
|
||||||
|
|
|
@ -40,7 +40,8 @@ _cmake_file_hidden_is(const char *file)
|
||||||
static void
|
static void
|
||||||
_cmake_build(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_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_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
|
||||||
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
|
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
|
||||||
|
@ -50,7 +51,8 @@ _cmake_build(void)
|
||||||
static void
|
static void
|
||||||
_cmake_test(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_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_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
|
||||||
ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
|
ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
|
||||||
|
@ -59,7 +61,8 @@ _cmake_test(void)
|
||||||
static void
|
static void
|
||||||
_cmake_clean(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_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_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
|
||||||
ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
|
ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
|
||||||
|
|
|
@ -47,7 +47,8 @@ _make_file_hidden_is(const char *file)
|
||||||
static void
|
static void
|
||||||
_make_build_make(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_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_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
|
||||||
ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
|
ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
|
||||||
|
@ -56,7 +57,8 @@ _make_build_make(void)
|
||||||
static void
|
static void
|
||||||
_make_build_configure(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_run("./configure && " BEAR_COMMAND MAKE_COMMAND,
|
||||||
ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
|
ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
|
||||||
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
|
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
|
||||||
|
@ -66,7 +68,8 @@ _make_build_configure(void)
|
||||||
static void
|
static void
|
||||||
_make_build_autogen(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_run("./autogen.sh && " BEAR_COMMAND MAKE_COMMAND,
|
||||||
ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
|
ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
|
||||||
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
|
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
|
||||||
|
@ -87,6 +90,8 @@ _make_build(void)
|
||||||
static void
|
static void
|
||||||
_make_test(void)
|
_make_test(void)
|
||||||
{
|
{
|
||||||
|
if (chdir(edi_project_get()) != 0)
|
||||||
|
ERR("Could not chdir");
|
||||||
chdir(edi_project_get());
|
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_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 |
|
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
|
||||||
|
@ -96,7 +101,8 @@ _make_test(void)
|
||||||
static void
|
static void
|
||||||
_make_clean(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_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_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
|
||||||
ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
|
ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
|
||||||
|
|
|
@ -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);
|
handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _edi_create_project_done, data);
|
||||||
create->handler = handler;
|
create->handler = handler;
|
||||||
|
|
||||||
chdir(create->path);
|
if (chdir(create->path) != 0)
|
||||||
|
ERR("Could not chdir");
|
||||||
|
|
||||||
command = eina_strbuf_new();
|
command = eina_strbuf_new();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue