commit 49e87a6d79cd4d4a599eebbf9b4a8ba3e97ae478
parent bec92d92f6672e690c5a13bf4850e3214086f242
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Tue, 15 Apr 2025 16:39:44 +0200
delete autotools specifics and meson specifics, use configure and make
Diffstat:
| M | buildbot/master.cfg | | | 109 | ++++++++++++++++++++----------------------------------------------------------- |
1 file changed, 27 insertions(+), 82 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -444,7 +444,6 @@ SCHEDULERS.append(schedulers.AnyBranchScheduler(
repository='git://git.gnunet.org/gnunet.git'),
treeStableTimer=None,
builderNames=["gnunet-debian-x86_64",
- "gnunet-debian-x86_64-autotools",
"gnunet-fedora-aarch64"]))
SCHEDULERS.append(schedulers.AnyBranchScheduler(
@@ -582,7 +581,6 @@ def add_default_pipeline(bldr):
factory = util.BuildFactory()
-factoryMeson = util.BuildFactory()
###########################
@@ -595,7 +593,7 @@ gnunet_make_step = steps.ShellSequence(
'TMPDIR': '/tmp/gnunet/'},
haltOnFailure=True,
commands=[
- util.ShellArg(command=['./bootstrap', 'autotools'], logname='bootstrap', haltOnFailure=True),
+ util.ShellArg(command=['./bootstrap'], logname='bootstrap', haltOnFailure=True),
util.ShellArg(command=['./configure',
"--prefix=/tmp/gnunet-buildbot",
"--enable-experimental",
@@ -617,41 +615,6 @@ gnunet_make_step = steps.ShellSequence(
haltOnFailure=True)]
)
-gnunet_meson_step = steps.ShellSequence(
- name=util.Interpolate("GNUnet build"),
- env={'GNUNET_PREFIX': '/tmp/gnunet-buildbot/lib',
- 'PATH': ["/tmp/gnunet-buildbot/bin", "${PATH}"],
- 'TMPDIR': '/tmp/gnunet/'},
- haltOnFailure=True,
- commands=[
- util.ShellArg(command=['git', 'fetch', '--tags'], logname='get tags', haltOnFailure=True),
- util.ShellArg(command=['./bootstrap'], logname='bootstrap', haltOnFailure=True),
- util.ShellArg(command=['meson', 'setup',
- "-Dprefix=/tmp/gnunet-buildbot",
- "-Dexperimental=true",
- "-Dlogging=verbose",
- "build"],
- logname='setup',
- haltOnFailure=True),
- util.ShellArg(command=['meson', 'compile', '-C', 'build'],
- logname='compile',
- haltOnFailure=True),
- util.ShellArg(command=['meson', 'install', '-C', 'build'],
- logname='install',
- haltOnFailure=True),
- util.ShellArg(command=['ninja', 'uninstall', '-C', 'build'],
- logname='ninja uninstall',
- haltOnFailure=True)]
-)
-
-gnunet_meson_build_steps = [
- steps.Git(repourl='git://git.gnunet.org/gnunet.git',
- mode='full', method='fresh'),
- gnunet_meson_step
-]
-
-factoryMeson.addSteps(gnunet_meson_build_steps)
-
gnunet_build_steps = [
steps.Git(repourl='git://git.gnunet.org/gnunet.git',
mode='full', method='fresh'),
@@ -671,11 +634,11 @@ cov_factory.addStep(steps.ShellSequence(
env={'PATH': "${HOME}/.local/bin:$HOME/bin:${PATH}"},
commands=[
util.ShellArg(command=['./bootstrap'], logname='bootstrap'),
- util.ShellArg(command=['meson', 'setup',
- "-Dprefix=/tmp/gnunet-buildbot",
- "-Dexperimental=true"],
+ util.ShellArg(command=['./configure',
+ "--prefix=/tmp/gnunet-buildbot",
+ "--enable-experimental=true"],
logname="configure"),
- util.ShellArg(command=['cov-build', '--dir', 'cov-int', 'meson', 'compile', '-C', 'build'], logname='cov-build'),
+ util.ShellArg(command=['cov-build', '--dir', 'cov-int', 'make'], logname='cov-build'),
]))
cov_factory.addStep(steps.ShellCommand(command=['tar', 'czf', 'coverity.tar.gz', 'cov-int/'],
haltOnFailure=True,
@@ -702,45 +665,37 @@ dist_factory = util.BuildFactory()
# https://github.com/buildbot/buildbot/issues/6539 change to "copy" when fixed
dist_factory.addStep(steps.Git(repourl='git://git.gnunet.org/gnunet.git', mode='full', method='clobber'))
-# We do meson first, because autotools changes the source...
-# There seems to be a meson bug where it thinks that the source was changed.
-# So we add --allow-dirty anyway
dist_factory.addStep(steps.ShellSequence(
- name=util.Interpolate("(Meson) Git rev. %(prop:got_revision)s build"),
+ name=util.Interpolate("Git rev. %(prop:got_revision)s build"),
haltOnFailure=True,
commands=[
util.ShellArg(command=['./bootstrap'],
logname='bootstrap',
haltOnFailure=True),
- util.ShellArg(command=['meson', 'setup', 'build'],
- logname='meson setup',
+ util.ShellArg(command=['./configure'],
+ logname='configure',
haltOnFailure=True),
util.ShellArg(command=['git', 'status'],
logname='status before dist',
haltOnFailure=True),
- util.ShellArg(command=['meson', 'dist',
- '-C', 'build',
- '--no-tests',
- '--formats', 'gztar', 'xztar'],
+ util.ShellArg(command=['make', 'dist'],
logname="dist",
haltOnFailure=True),
- util.ShellArg(command=['meson', 'compile',
- '-C', 'build',
- 'doxygen'],
+ util.ShellArg(command=['make', 'doxygen'],
haltOnFailure=True,
logname="Doxygen")
]))
# Get version number of tarball
-cmdmeson = r'ls -1 build/meson-dist/gnunet-*.tar.xz | sed "s/build\/meson-dist\/gnunet-//" | sed "s/.tar.xz//" | tail -n1'
+cmdmeson = r'ls -1 build/meson-dist/gnunet-*.tar.gz | sed "s/build\/meson-dist\/gnunet-//" | sed "s/.tar.gz//" | tail -n1'
#cmd = 'git describe --tags | sed "s/^v//"'
dist_factory.addStep(steps.SetPropertyFromCommand(hideStepIf=False,
command=cmdmeson,
property='gnunet_meson_releasever',
- name="(Meson) Getting release version"))
+ name="Getting release version"))
dist_factory.addStep(steps.ShellCommand(command=["tar",
"xf",
- util.Interpolate('build/meson-dist/gnunet-%(prop:gnunet_meson_releasever)s.tar.xz'),
+ util.Interpolate('build/meson-dist/gnunet-%(prop:gnunet_meson_releasever)s.tar.gz'),
'-C', 'build'],
haltOnFailure=True,
name="Extracting tarball"))
@@ -749,34 +704,30 @@ dist_factory.addStep(steps.ShellCommand(command=["tar",
# Try to build dist package
dist_factory.addStep(steps.ShellSequence(
workdir=util.Interpolate('build/build/gnunet-%(prop:gnunet_meson_releasever)s'),
- name=util.Interpolate("(Meson) GNUnet %(prop:gnunet_meson_releasever)s tarball build"),
+ name=util.Interpolate("GNUnet %(prop:gnunet_meson_releasever)s tarball build"),
env={'GNUNET_PREFIX': '/tmp/gnunet-buildbot/lib',
'PATH': ["/tmp/gnunet-buildbot/bin", "${PATH}"]},
commands=[
util.ShellArg(command=['mkdir', '-p', '$TMPDIR'],logname='tmpdir',haltOnFailure=True),
- util.ShellArg(command=['meson', 'setup',
- "-Dprefix=/tmp/gnunet-buildbot",
- "-Dexperimental=true",
- "-Dlogging=verbose",
- "tarball_build"],
+ util.ShellArg(command=['./configure',
+ "--prefix=/tmp/gnunet-buildbot",
+ "--enable-experimental=true",
+ "--enable-logging=verbose",
+ "--mesonbuilddir=tarball_build"],
logname='setup',
haltOnFailure=True),
- util.ShellArg(command=['meson', 'compile', '-C', 'tarball_build'],
+ util.ShellArg(command=['make'],
logname='compile',
haltOnFailure=True),
- util.ShellArg(command=['meson', 'install', '-C', 'tarball_build'],
+ util.ShellArg(command=['make', 'install'],
logname='install',
haltOnFailure=True),
- util.ShellArg(command=['ninja', 'uninstall', '-C', 'tarball_build'],
- logname='ninja uninstall',
+ util.ShellArg(command=['make', 'uninstall'],
+ logname='uninstall',
haltOnFailure=True)]
))
# Upload artifact to https://buildbot.gnunet.org/artifacts
-dist_factory.addStep(steps.FileUpload(workersrc=util.Interpolate('build/meson-dist/gnunet-%(prop:gnunet_meson_releasever)s.tar.xz'),
- mode=0o644,
- masterdest=util.Interpolate("~/artifacts/gnunet-%(prop:gnunet_releasever)s.tar.xz"),
- url=util.Interpolate("https://buildbot.gnunet.org/artifacts/gnunet-%(prop:gnunet_meson_releasever)s.tar.xz")))
dist_factory.addStep(steps.FileUpload(workersrc=util.Interpolate('build/meson-dist/gnunet-%(prop:gnunet_meson_releasever)s.tar.gz'),
mode=0o644,
masterdest=util.Interpolate("~/artifacts/gnunet-%(prop:gnunet_releasever)s.tar.gz"),
@@ -884,29 +835,24 @@ bb_factory.addStep(steps.ShellCommand(command=["./reload_bb-master.sh"], name="R
BUILDERS.append(
- util.BuilderConfig(name="gnunet-debian-x86_64-autotools",
- workernames=["firefly-x86_64-amdepyc"],
- factory=factory))
-
-BUILDERS.append(
util.BuilderConfig(name="gnunet-debian-x86_64",
workernames=["firefly-x86_64-amdepyc"],
- factory=factoryMeson))
+ factory=factory))
BUILDERS.append(
util.BuilderConfig(name="gnunet-fedora-aarch64",
workernames=["schanzen-aarch64-fedora-meson"],
- factory=factoryMeson))
+ factory=factory))
BUILDERS.append(
util.BuilderConfig(name="gnunet-debian-x86_64-dev",
workernames=["firefly-x86_64-amdepyc"],
- factory=factoryMeson))
+ factory=factory))
BUILDERS.append(
util.BuilderConfig(name="gnunet-fedora-aarch64-dev",
workernames=["schanzen-aarch64-fedora-meson"],
- factory=factoryMeson))
+ factory=factory))
BUILDERS.append(
@@ -1294,7 +1240,6 @@ SCHEDULERS.append(schedulers.ForceScheduler(
buttonName="Trigger build",
builderNames=["gnunet-fedora-aarch64",
"gnunet-debian-x86_64",
- "gnunet-debian-x86_64-autotools",
"gnunet_release",
"gnunet_coverity",
"stage.gnunet.org",
