Skip to content

Commit

Permalink
Don't attempt to run packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@SanderMertens
SanderMertens committed Sep 4, 2023
1 parent b733919 commit ef6c177
Showing 1 changed file with 81 additions and 85 deletions.
166 changes: 81 additions & 85 deletions src/run.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,40 +296,34 @@ ut_proc run_exec(
const char *exec,
const char *app_id,
const char *prefix,
bool is_package,
int argc,
const char *argv[])
{
if (!is_package) {
const char *local_argv[1024] = {(char*)exec};
int i = 1;

if (prefix) {
local_argv[0] = prefix;
local_argv[1] = exec;
i ++;
exec = prefix;
}
const char *local_argv[1024] = {(char*)exec};
int i = 1;

if (prefix) {
local_argv[0] = prefix;
local_argv[1] = exec;
i ++;
exec = prefix;
}

if (argc) {
if (argv) {
for (;i < argc; i ++) {
local_argv[i] = argv[i - 1];
}
if (argc) {
if (argv) {
for (;i < argc; i ++) {
local_argv[i] = argv[i - 1];
}
}
}

local_argv[i] = NULL;
local_argv[i] = NULL;

ut_proc pid = ut_proc_run(exec, local_argv);
ut_proc pid = ut_proc_run(exec, local_argv);

bake_message(UT_LOG, "run", "#[green]application#[reset] %s [%u] '%s'", app_id, pid, exec);
bake_message(UT_LOG, "run", "#[green]application#[reset] %s [%u] '%s'", app_id, pid, exec);

return pid;
} else {
/* TODO */
return 0;
}
return pid;
}

static
Expand All @@ -338,7 +332,6 @@ int16_t run_interactive(
const char *app_bin,
const char *app_id,
const char *prefix,
bool is_package,
int argc,
const char *argv[])
{
Expand Down Expand Up @@ -377,7 +370,7 @@ int16_t run_interactive(
if (!pid) {
/* Run process, ensure process binary is first argument */
{
pid = run_exec(app_bin, app_id, prefix, is_package, argc, argv);
pid = run_exec(app_bin, app_id, prefix, argc, argv);
last_pid = pid;
}
}
Expand Down Expand Up @@ -597,80 +590,83 @@ int bake_run(
}
}

if (interactive) {
if (!project_dir) {
ut_warning(
"don't know location of sourcefiles, interactive mode disabled");
interactive = false;
if (!is_package) {
if (interactive) {
if (!project_dir) {
ut_warning(
"don't know location of sourcefiles, interactive mode disabled");
interactive = false;
}
}
}

ut_ok("starting app '%s'", app_id);
ut_ok(" executable = '%s'", app_bin);
ut_ok(" project path = '%s'", project_dir);
ut_ok(" project kind = '%s'", is_package ? "package" : "application");
ut_ok(" interactive = '%s'", interactive ? "true" : "false");

/* Always run project from project directory, if there is one */
if (project_dir) {
ut_chdir(project_dir);
}

if (interactive) {
/* Run process & monitor source for changes */
if (run_interactive(project_dir, app_bin, app_id, prefix, is_package, argc, argv)) {
goto error;
}
} else {
/* Just run process */
ut_proc pid;
ut_trace("starting process '%s'", app_bin);
ut_ok("starting app '%s'", app_id);
ut_ok(" executable = '%s'", app_bin);
ut_ok(" project path = '%s'", project_dir);
ut_ok(" project kind = '%s'", is_package ? "package" : "application");
ut_ok(" interactive = '%s'", interactive ? "true" : "false");

/* Always run project from project directory, if there is one */
if (project_dir) {
ut_try( build_project("."), "build failed, cannot run");
ut_chdir(project_dir);
}

if (argc) {
pid = run_exec(app_bin, app_id, prefix, is_package, argc, argv);
if (interactive) {
/* Run process & monitor source for changes */
if (run_interactive(project_dir, app_bin, app_id, prefix, argc, argv)) {
goto error;
}
} else {
pid = run_exec(
app_bin, app_id, prefix, is_package, 1, (const char*[]){
(char*)app_bin, NULL});
}
if (!pid) {
ut_throw("failed to start process '%s'", app_bin);
goto error;
}
/* Just run process */
ut_proc pid;
ut_trace("starting process '%s'", app_bin);

ut_trace("waiting for process '%s'", app_bin);
int8_t result = 0, sig = 0;
if ((sig = ut_proc_wait(pid, &result)) || result) {
if (sig > 0) {
ut_throw("process crashed (%d)", sig);
ut_raise();

ut_strbuf cmd_args = UT_STRBUF_INIT;
int i;
for (i = 1; i < argc; i ++) {
ut_strbuf_appendstr(&cmd_args, argv[i]);
}
if (project_dir) {
ut_try( build_project("."), "build failed, cannot run");
}

if (argc) {
pid = run_exec(app_bin, app_id, prefix, argc, argv);
} else {
pid = run_exec(
app_bin, app_id, prefix, 1, (const char*[]){
(char*)app_bin, NULL});
}
if (!pid) {
ut_throw("failed to start process '%s'", app_bin);
goto error;
}

char *args = ut_strbuf_get(&cmd_args);
ut_trace("waiting for process '%s'", app_bin);
int8_t result = 0, sig = 0;
if ((sig = ut_proc_wait(pid, &result)) || result) {
if (sig > 0) {
ut_throw("process crashed (%d)", sig);
ut_raise();

printf("\n");
printf("to debug your application, do:\n");
ut_log(" export $(bake env)\n");
ut_log(" %s %s\n", app_bin, args ? args : "");
printf("\n");
ut_strbuf cmd_args = UT_STRBUF_INIT;
int i;
for (i = 1; i < argc; i ++) {
ut_strbuf_appendstr(&cmd_args, argv[i]);
}

char *args = ut_strbuf_get(&cmd_args);

free(args);
printf("\n");
printf("to debug your application, do:\n");
ut_log(" export $(bake env)\n");
ut_log(" %s %s\n", app_bin, args ? args : "");
printf("\n");

free(args);
}

goto error;
}

goto error;
bake_message(UT_LOG, "done", "#[green]application#[reset] %s [%u] '%s'",
app_id, pid, app_bin);
}

bake_message(UT_LOG, "done", "#[green]application#[reset] %s [%u] '%s'",
app_id, pid, app_bin);
}

ut_chdir(cwd);
Expand Down

0 comments on commit ef6c177

Please sign in to comment.