-
-
Notifications
You must be signed in to change notification settings - Fork 313
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
autotools -> meson #1422
autotools -> meson #1422
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,48 +1,8 @@ | ||
/.pls_cache | ||
*.o | ||
*~ | ||
Makefile | ||
Makefile.in | ||
.deps | ||
.hydra-data | ||
/config.guess | ||
/config.log | ||
/config.status | ||
/config.sub | ||
/configure | ||
/depcomp | ||
/libtool | ||
/ltmain.sh | ||
/autom4te.cache | ||
/aclocal.m4 | ||
/missing | ||
/install-sh | ||
.test_info.* | ||
/src/sql/hydra-postgresql.sql | ||
/src/sql/hydra-sqlite.sql | ||
/src/sql/tmp.sqlite | ||
/src/hydra-eval-jobs/hydra-eval-jobs | ||
/src/root/static/bootstrap | ||
/src/root/static/js/flot | ||
/tests | ||
/doc/manual/images | ||
/doc/manual/manual.html | ||
/doc/manual/manual.pdf | ||
/t/.bzr* | ||
/t/.git* | ||
/t/.hg* | ||
/t/nix | ||
/t/data | ||
/t/jobs/config.nix | ||
t/jobs/declarative/project.json | ||
/inst | ||
hydra-config.h | ||
hydra-config.h.in | ||
result | ||
result-* | ||
outputs | ||
config | ||
stamp-h1 | ||
src/hydra-evaluator/hydra-evaluator | ||
src/hydra-queue-runner/hydra-queue-runner | ||
src/root/static/fontawesome/ | ||
src/root/static/bootstrap*/ |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
srcs = files( | ||
'src/SUMMARY.md', | ||
'src/about.md', | ||
'src/api.md', | ||
'src/configuration.md', | ||
'src/hacking.md', | ||
'src/installation.md', | ||
'src/introduction.md', | ||
'src/jobs.md', | ||
'src/monitoring/README.md', | ||
'src/notifications.md', | ||
'src/plugins/README.md', | ||
'src/plugins/RunCommand.md', | ||
'src/plugins/declarative-projects.md', | ||
'src/projects.md', | ||
'src/webhooks.md', | ||
) | ||
|
||
manual = custom_target( | ||
'manual', | ||
command: [ | ||
mdbook, | ||
'build', | ||
'@SOURCE_ROOT@/doc/manual', | ||
'-d', meson.current_build_dir() / 'html' | ||
], | ||
depend_files: srcs, | ||
output: ['html'], | ||
build_by_default: true, | ||
) | ||
|
||
install_subdir( | ||
manual.full_path(), | ||
install_dir: get_option('datadir') / 'doc/hydra', | ||
strip_directory: true, | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
project('hydra', 'cpp', | ||
version: files('version.txt'), | ||
license: 'GPL-3.0', | ||
default_options: [ | ||
'debug=true', | ||
'optimization=2', | ||
'cpp_std=c++20', | ||
], | ||
) | ||
|
||
nix_store_dep = dependency('nix-store', required: true) | ||
nix_main_dep = dependency('nix-main', required: true) | ||
nix_expr_dep = dependency('nix-expr', required: true) | ||
nix_flake_dep = dependency('nix-flake', required: true) | ||
nix_cmd_dep = dependency('nix-cmd', required: true) | ||
|
||
# Nix need extra flags not provided in its pkg-config files. | ||
nix_dep = declare_dependency( | ||
dependencies: [ | ||
nix_store_dep, | ||
nix_main_dep, | ||
nix_expr_dep, | ||
nix_flake_dep, | ||
nix_cmd_dep, | ||
], | ||
compile_args: ['-include', 'nix/config.h'], | ||
) | ||
|
||
pqxx_dep = dependency('libpqxx', required: true) | ||
|
||
prom_cpp_core_dep = dependency('prometheus-cpp-core', required: true) | ||
prom_cpp_pull_dep = dependency('prometheus-cpp-pull', required: true) | ||
|
||
mdbook = find_program('mdbook', native: true) | ||
perl = find_program('perl', native: true) | ||
|
||
subdir('doc/manual') | ||
subdir('nixos-modules') | ||
subdir('src') | ||
subdir('t') |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
install_data('hydra.nix', | ||
install_dir: get_option('datadir') / 'nix', | ||
rename: ['hydra-module.nix'], | ||
) |
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
hydra_eval_jobs = executable('hydra-eval-jobs', | ||
'hydra-eval-jobs.cc', | ||
dependencies: [ | ||
libhydra_dep, | ||
nix_dep, | ||
], | ||
install: true, | ||
) |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
hydra_evaluator = executable('hydra-evaluator', | ||
'hydra-evaluator.cc', | ||
dependencies: [ | ||
libhydra_dep, | ||
nix_dep, | ||
pqxx_dep, | ||
], | ||
install: true, | ||
) |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
srcs = files( | ||
'builder.cc', | ||
'build-remote.cc', | ||
'build-result.cc', | ||
'dispatcher.cc', | ||
'hydra-queue-runner.cc', | ||
'nar-extractor.cc', | ||
'queue-monitor.cc', | ||
) | ||
|
||
hydra_queue_runner = executable('hydra-queue-runner', | ||
'hydra-queue-runner.cc', | ||
srcs, | ||
dependencies: [ | ||
libhydra_dep, | ||
nix_dep, | ||
pqxx_dep, | ||
prom_cpp_core_dep, | ||
prom_cpp_pull_dep, | ||
], | ||
install: true, | ||
) |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
libhydra_inc = include_directories('.') | ||
|
||
libhydra_dep = declare_dependency( | ||
include_directories: [libhydra_inc], | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
# Native code | ||
subdir('libhydra') | ||
subdir('hydra-eval-jobs') | ||
subdir('hydra-evaluator') | ||
subdir('hydra-queue-runner') | ||
|
||
hydra_libexecdir = get_option('libexecdir') / 'hydra' | ||
|
||
# Data and interpreted | ||
foreach dir : ['lib', 'root'] | ||
install_subdir(dir, | ||
install_dir: hydra_libexecdir, | ||
) | ||
endforeach | ||
subdir('sql') | ||
subdir('ttf') | ||
|
||
# Static files for website | ||
|
||
hydra_libexecdir_static = hydra_libexecdir / 'root' / 'static' | ||
|
||
## Bootstrap | ||
|
||
bootstrap_name = 'bootstrap-4.3.1-dist' | ||
bootstrap = custom_target( | ||
'extract-bootstrap', | ||
input: 'root' / (bootstrap_name + '.zip'), | ||
output: bootstrap_name, | ||
command: ['unzip', '-u', '-d', '@OUTDIR@', '@INPUT@'], | ||
) | ||
custom_target( | ||
'name-bootstrap', | ||
input: bootstrap, | ||
output: 'bootstrap', | ||
command: ['cp', '-r', '@INPUT@' , '@OUTPUT@'], | ||
install: true, | ||
install_dir: hydra_libexecdir_static, | ||
) | ||
|
||
## Flot | ||
|
||
custom_target( | ||
'extract-flot', | ||
input: 'root' / 'flot-0.8.3.zip', | ||
output: 'flot', | ||
command: ['unzip', '-u', '-d', '@OUTDIR@', '@INPUT@'], | ||
install: true, | ||
install_dir: hydra_libexecdir_static / 'js', | ||
) | ||
|
||
## Fontawesome | ||
|
||
fontawesome_name = 'fontawesome-free-5.10.2-web' | ||
fontawesome = custom_target( | ||
'extract-fontawesome', | ||
input: 'root' / (fontawesome_name + '.zip'), | ||
output: fontawesome_name, | ||
command: ['unzip', '-u', '-d', '@OUTDIR@', '@INPUT@'], | ||
) | ||
custom_target( | ||
'name-fontawesome-css', | ||
input: fontawesome, | ||
output: 'css', | ||
command: ['cp', '-r', '@INPUT@/css', '@OUTPUT@'], | ||
install: true, | ||
install_dir: hydra_libexecdir_static / 'fontawesome', | ||
) | ||
custom_target( | ||
'name-fontawesome-webfonts', | ||
input: fontawesome, | ||
output: 'webfonts', | ||
command: ['cp', '-r', '@INPUT@/webfonts', '@OUTPUT@'], | ||
install: true, | ||
install_dir: hydra_libexecdir_static / 'fontawesome', | ||
) | ||
|
||
# Scripts | ||
|
||
install_subdir('script', | ||
install_dir: get_option('bindir'), | ||
exclude_files: [ | ||
'hydra-dev-server', | ||
], | ||
install_mode: 'rwxr-xr-x', | ||
strip_directory: true, | ||
) |
This file was deleted.
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
sql_files = files( | ||
'hydra.sql', | ||
'test.sql', | ||
'update-dbix.pl', | ||
'upgrade-2.sql', | ||
'upgrade-3.sql', | ||
'upgrade-4.sql', | ||
'upgrade-5.sql', | ||
'upgrade-6.sql', | ||
'upgrade-7.sql', | ||
'upgrade-8.sql', | ||
'upgrade-9.sql', | ||
'upgrade-10.sql', | ||
'upgrade-11.sql', | ||
'upgrade-12.sql', | ||
'upgrade-13.sql', | ||
'upgrade-14.sql', | ||
'upgrade-15.sql', | ||
'upgrade-16.sql', | ||
'upgrade-17.sql', | ||
'upgrade-18.sql', | ||
'upgrade-19.sql', | ||
'upgrade-20.sql', | ||
'upgrade-21.sql', | ||
'upgrade-22.sql', | ||
'upgrade-23.sql', | ||
'upgrade-24.sql', | ||
'upgrade-25.sql', | ||
'upgrade-26.sql', | ||
'upgrade-27.sql', | ||
'upgrade-28.sql', | ||
'upgrade-29.sql', | ||
'upgrade-30.sql', | ||
'upgrade-31.sql', | ||
'upgrade-32.sql', | ||
'upgrade-33.sql', | ||
'upgrade-34.sql', | ||
'upgrade-35.sql', | ||
'upgrade-36.sql', | ||
'upgrade-37.sql', | ||
'upgrade-38.sql', | ||
'upgrade-39.sql', | ||
'upgrade-40.sql', | ||
'upgrade-41.sql', | ||
'upgrade-42.sql', | ||
'upgrade-43.sql', | ||
'upgrade-44.sql', | ||
'upgrade-45.sql', | ||
'upgrade-46.sql', | ||
'upgrade-47.sql', | ||
'upgrade-48.sql', | ||
'upgrade-49.sql', | ||
'upgrade-50.sql', | ||
'upgrade-51.sql', | ||
'upgrade-52.sql', | ||
'upgrade-53.sql', | ||
'upgrade-54.sql', | ||
'upgrade-55.sql', | ||
'upgrade-56.sql', | ||
'upgrade-57.sql', | ||
'upgrade-58.sql', | ||
'upgrade-59.sql', | ||
'upgrade-60.sql', | ||
'upgrade-61.sql', | ||
'upgrade-62.sql', | ||
'upgrade-63.sql', | ||
'upgrade-64.sql', | ||
'upgrade-65.sql', | ||
'upgrade-66.sql', | ||
'upgrade-67.sql', | ||
'upgrade-68.sql', | ||
'upgrade-69.sql', | ||
'upgrade-70.sql', | ||
'upgrade-71.sql', | ||
'upgrade-72.sql', | ||
'upgrade-73.sql', | ||
'upgrade-74.sql', | ||
'upgrade-75.sql', | ||
'upgrade-76.sql', | ||
'upgrade-77.sql', | ||
'upgrade-78.sql', | ||
'upgrade-79.sql', | ||
'upgrade-80.sql', | ||
'upgrade-81.sql', | ||
'upgrade-82.sql', | ||
'upgrade-83.sql', | ||
'upgrade-84.sql', | ||
) | ||
|
||
install_data(sql_files, install_dir: hydra_libexecdir / 'sql') |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
data_files = files( | ||
'StayPuft.ttf', | ||
'COPYING.LIB', | ||
) | ||
install_data(data_files, install_dir: hydra_libexecdir / 'ttf') |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
fs = import('fs') | ||
|
||
test('perlcritic', | ||
perl, | ||
args: ['-w', files('perlcritic.pl')], | ||
workdir: meson.project_source_root(), | ||
timeout: -1, | ||
) | ||
|
||
testenv = environment( | ||
{ | ||
'BZR_HOME': meson.current_build_dir() / 'data', | ||
'HYDRA_DBI': 'dbi:Pg:dbname=hydra-test-suite;port=6433', | ||
'HYDRA_DATA': meson.current_build_dir() / 'data', | ||
'HYDRA_HOME': meson.project_source_root() / 'src', | ||
'PGHOST': '/tmp', | ||
'PYTHONPATH': '', | ||
|
||
# libpqxx seems to randomly crash with certain values of MALLOC_PERTURB_, | ||
# set by default by Meson's test(). Very promising, high quality software. | ||
'MALLOC_PERTURB_': '0', | ||
}, | ||
) | ||
testenv.prepend('PERL5LIB', | ||
meson.current_source_dir(), | ||
meson.project_source_root() / 'src/lib', | ||
separator: ':' | ||
) | ||
testenv.prepend('PATH', | ||
fs.parent(hydra_eval_jobs.full_path()), | ||
fs.parent(hydra_evaluator.full_path()), | ||
fs.parent(hydra_queue_runner.full_path()), | ||
meson.project_source_root() / 'src/script', | ||
separator: ':' | ||
) | ||
|
||
test('testsuite', | ||
perl, | ||
args: ['-I', meson.current_source_dir() / 'lib', '-w', files('test.pl')], | ||
env: testenv, | ||
workdir: meson.current_source_dir(), | ||
timeout: -1, | ||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It'd be nice if we could glob this but it looks like that's not how it's supposed to be done in meson land
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Someday Meson will have a Nix backend using dynamic derivations, and then this will work :)