From: Mark Wielaard <mark@klomp.org>
To: buildbot@sourceware.org
Cc: Dodji Seketeli <dodji@seketeli.org>, Mark Wielaard <mark@klomp.org>
Subject: [PATCH] libabigail builder needs to run inside a sub build dir
Date: Sun, 9 Apr 2023 23:20:30 +0200 [thread overview]
Message-ID: <20230409212030.3002007-1-mark@klomp.org> (raw)
Otherwise the website isn't generated.
---
builder/master.cfg | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/builder/master.cfg b/builder/master.cfg
index 57d7fb8..e66804b 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -1015,6 +1015,16 @@ configure_step = steps.Configure(
"--enable-maintainer-mode"],
name="configure", haltOnFailure=True,
logfiles={"config.log": "config.log"})
+# create a build subdir
+mkdir_build_step = steps.ShellCommand(
+ command=["mkdir", "build"],
+ name="mkdir build")
+# configure in a build subdir
+build_configure_step = steps.Configure(
+ workdir='build/build',
+ command=["../configure"],
+ name="configure", haltOnFailure=True,
+ logfiles={"config.log": "config.log"})
# Sets package_version property so it can be used from a next step
# Gets version from the config.h files, so needs to be run after
# configure. Normally used together with package_name property as
@@ -3603,9 +3613,11 @@ libabigail_rm_dist = steps.ShellCommand(
name= "rm -rf libabigail-*")
libabigail_make_html_doc_step = steps.Compile(
+ workdir="build/build",
name="make html-doc",
command=["make", "html-doc"])
libabigail_create_output_step = steps.ShellCommand(
+ workdir="build/build",
name="create output",
command="mkdir /home/builder/shared/output && mv ./doc/manuals/html /home/builder/shared/output/manuals && mv ./doc/api/html /home/builder/shared/output/api && mv ./doc/website/html /home/builder/shared/output/website")
libabigail_create_publish_file_step = steps.ShellCommand(
@@ -3642,7 +3654,8 @@ libabigail_factory_checkonly.addStep(make_distclean_step)
libabigail_factory_snapshot_html_doc = util.BuildFactory()
libabigail_factory_snapshot_html_doc.addStep(libabigail_git_step)
libabigail_factory_snapshot_html_doc.addStep(autoreconf_step)
-libabigail_factory_snapshot_html_doc.addStep(configure_step)
+libabigail_factory_snapshot_html_doc.addStep(mkdir_build_step)
+libabigail_factory_snapshot_html_doc.addStep(build_configure_step)
libabigail_factory_snapshot_html_doc.addStep(libabigail_make_html_doc_step)
libabigail_factory_snapshot_html_doc.addStep(wait_snapshots_output_ready_step)
libabigail_factory_snapshot_html_doc.addStep(libabigail_create_output_step)
--
2.31.1
reply other threads:[~2023-04-09 21:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230409212030.3002007-1-mark@klomp.org \
--to=mark@klomp.org \
--cc=buildbot@sourceware.org \
--cc=dodji@seketeli.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).