Skip to content

Commit

Permalink
Don't ignore --build-shell option when configuration fails
Browse files Browse the repository at this point in the history 
--build-shell is supposed to help in debbuging problems
for modules, that may be a failure to build, to configure,
etc.

So it doesn't make much sense that if the configuration
step fails we ignore the --build-shell option, which the
developer probably use it to debug that configure problem.

Fixes flatpak#479
  • Loading branch information
@nbenitez
nbenitez committed Nov 23, 2024
1 parent f2d0567 commit 7c18868
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions src/builder-module.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1590,7 +1590,7 @@ builder_module_build_helper (BuilderModule *self,
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "module %s: Invalid buildsystem: \"%s\"",
self->name, self->buildsystem);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}

if (simple)
Expand All @@ -1599,7 +1599,7 @@ builder_module_build_helper (BuilderModule *self,
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "module %s: Buildsystem simple requires specifying \"build-commands\"",
self->name);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}
}
else if (cmake || cmake_ninja)
Expand All @@ -1610,7 +1610,7 @@ builder_module_build_helper (BuilderModule *self,
if (!g_file_query_exists (cmake_file, NULL))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "module: %s: Can't find CMakeLists.txt", self->name);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}
configure_file = g_object_ref (cmake_file);
}
Expand All @@ -1622,7 +1622,7 @@ builder_module_build_helper (BuilderModule *self,
if (!g_file_query_exists (meson_file, NULL))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "module: %s: Can't find meson.build", self->name);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}
configure_file = g_object_ref (meson_file);
}
Expand All @@ -1632,7 +1632,7 @@ builder_module_build_helper (BuilderModule *self,
if (configure_file == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "module: %s: Can't find *.pro file", self->name);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}
}
else if (autotools)
Expand All @@ -1644,7 +1644,7 @@ builder_module_build_helper (BuilderModule *self,
if (!g_file_delete (configure_file, NULL, error))
{
g_prefix_error (error, "module %s: ", self->name);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}
}
}
Expand All @@ -1671,21 +1671,21 @@ builder_module_build_helper (BuilderModule *self,
if (autogen_cmd == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "module %s: Can't find autogen, autogen.sh or bootstrap", self->name);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}

env_with_noconfigure = g_environ_setenv (g_strdupv (env), "NOCONFIGURE", "1", TRUE);
if (!build (app_dir, self->name, context, source_dir, source_subdir_relative, build_args, env_with_noconfigure, error,
autogen_cmd, NULL))
{
g_prefix_error (error, "module %s: ", self->name);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}

if (!g_file_query_exists (configure_file, NULL))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "module %s: autogen did not create configure", self->name);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}

has_configure = TRUE;
Expand All @@ -1705,7 +1705,7 @@ builder_module_build_helper (BuilderModule *self,
if (!g_file_load_contents (configure_file, NULL, &configure_content, NULL, NULL, error))
{
g_prefix_error (error, "module %s: ", self->name);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}

var_require_builddir = strstr (configure_content, "buildapi-variable-require-builddir") != NULL;
Expand All @@ -1722,7 +1722,7 @@ builder_module_build_helper (BuilderModule *self,
if (!g_file_make_directory (build_dir, NULL, error))
{
g_prefix_error (error, "module %s: ", self->name);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}

if (cmake || cmake_ninja)
Expand Down Expand Up @@ -1819,7 +1819,7 @@ builder_module_build_helper (BuilderModule *self,

if (!build (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error,
configure_cmd, strv_arg, configure_args, strv_arg, config_opts, secret_arg, secret_opts, NULL))
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}
else
{
Expand All @@ -1833,7 +1833,7 @@ builder_module_build_helper (BuilderModule *self,
if (!g_file_query_exists (ninja_file, NULL))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "module %s: Can't find ninja file", self->name);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}
}
else if (autotools || cmake || qmake)
Expand All @@ -1850,7 +1850,7 @@ builder_module_build_helper (BuilderModule *self,
if (makefile_names[i] == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "module %s: Can't find makefile", self->name);
return FALSE;
return run_shell ? shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error) : FALSE;
}
}

Expand Down

0 comments on commit 7c18868

Please sign in to comment.