wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

rename: build-utils-meson -> nix-meson-build-support

Browse source 
Fix a footgun. In my case, I had a couple of build ("output")
directories sitting around.

    rm -rf build-*

Was confused for a bit why a meson.build file was missing.

Probably also helps with autocompletion.

I tried meson-build-support first, but I had to add something like
a nix- prefix, in order to make meson happy. They've reserved the
meson- prefix.
This commit is contained in:
Robert Hensing 2024-12-09 16:39:48 +01:00
parent 3081e7ce90
commit d0b4db924a
92 changed files with 178 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

0
build-utils-meson/common/meson.build → nix-meson-build-support/common/meson.build
View file

0
build-utils-meson/deps-lists/meson.build → nix-meson-build-support/deps-lists/meson.build
View file

0
build-utils-meson/export-all-symbols/meson.build → nix-meson-build-support/export-all-symbols/meson.build
View file

0
build-utils-meson/export/meson.build → nix-meson-build-support/export/meson.build
View file

0
build-utils-meson/generate-header/meson.build → nix-meson-build-support/generate-header/meson.build
View file

0
build-utils-meson/libatomic/meson.build → nix-meson-build-support/libatomic/meson.build
View file

0
build-utils-meson/subprojects/meson.build → nix-meson-build-support/subprojects/meson.build
View file

0
build-utils-meson/windows-version/meson.build → nix-meson-build-support/windows-version/meson.build
View file

1
src/libcmd/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

8
src/libcmd/meson.build
View file

@ -14,7 +14,7 @@ project('nix-cmd', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -28,7 +28,7 @@ deps_public_maybe_subproject = [
dependency('nix-flake'), dependency('nix-flake'),
dependency('nix-main'), dependency('nix-main'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
nlohmann_json = dependency('nlohmann_json', version : '>= 3.9') nlohmann_json = dependency('nlohmann_json', version : '>= 3.9')
deps_public += nlohmann_json deps_public += nlohmann_json
@ -70,7 +70,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'built-path.cc', 'built-path.cc',
@ -125,4 +125,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libcmd/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libcmd/package.nix
View file

@ -39,8 +39,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libexpr-c/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

12
src/libexpr-c/meson.build
View file

@ -14,7 +14,7 @@ project('nix-expr-c', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -27,7 +27,7 @@ deps_public_maybe_subproject = [
dependency('nix-util-c'), dependency('nix-util-c'),
dependency('nix-store-c'), dependency('nix-store-c'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
# TODO rename, because it will conflict with downstream projects # TODO rename, because it will conflict with downstream projects
configdata.set_quoted('PACKAGE_VERSION', meson.project_version()) configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
@ -53,7 +53,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'nix_api_expr.cc', 'nix_api_expr.cc',
@ -72,8 +72,8 @@ headers = [config_h] + files(
# TODO move this header to libexpr, maybe don't use it in tests? # TODO move this header to libexpr, maybe don't use it in tests?
headers += files('nix_api_expr_internal.h') headers += files('nix_api_expr_internal.h')
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixexprc', 'nixexprc',
@ -89,4 +89,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libexpr-c/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libexpr-c/package.nix
View file

@ -20,8 +20,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libexpr-test-support/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

12
src/libexpr-test-support/meson.build
View file

@ -14,7 +14,7 @@ project('nix-expr-test-support', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
] ]
@ -26,7 +26,7 @@ deps_public_maybe_subproject = [
dependency('nix-expr'), dependency('nix-expr'),
dependency('nix-expr-c'), dependency('nix-expr-c'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_public += rapidcheck deps_public += rapidcheck
@ -40,7 +40,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'tests/value/context.cc', 'tests/value/context.cc',
@ -54,8 +54,8 @@ headers = files(
'tests/value/context.hh', 'tests/value/context.hh',
) )
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nix-expr-test-support', 'nix-expr-test-support',
@ -73,4 +73,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libexpr-test-support/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libexpr-test-support/package.nix
View file

@ -23,8 +23,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libexpr-tests/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

10
src/libexpr-tests/meson.build
View file

@ -14,7 +14,7 @@ project('nix-expr-tests', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
dependency('nix-expr'), dependency('nix-expr'),
@ -23,10 +23,10 @@ deps_private_maybe_subproject = [
] ]
deps_public_maybe_subproject = [ deps_public_maybe_subproject = [
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_private += rapidcheck deps_private += rapidcheck
@ -49,7 +49,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'derived-path.cc', 'derived-path.cc',

1
src/libexpr-tests/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libexpr-tests/package.nix
View file

@ -27,8 +27,8 @@ mkMesonExecutable (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libexpr/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

10
src/libexpr/meson.build
View file

@ -14,7 +14,7 @@ project('nix-expr', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -25,7 +25,7 @@ deps_public_maybe_subproject = [
dependency('nix-store'), dependency('nix-store'),
dependency('nix-fetchers'), dependency('nix-fetchers'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
boost = dependency( boost = dependency(
'boost', 'boost',
@ -77,7 +77,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
parser_tab = custom_target( parser_tab = custom_target(
input : 'parser.y', input : 'parser.y',
@ -121,7 +121,7 @@ lexer_tab = custom_target(
install_dir : get_option('includedir') / 'nix', install_dir : get_option('includedir') / 'nix',
) )
subdir('build-utils-meson/generate-header') subdir('nix-meson-build-support/generate-header')
generated_headers = [] generated_headers = []
foreach header : [ foreach header : [
@ -205,4 +205,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libexpr/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libexpr/package.nix
View file

@ -40,8 +40,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libfetchers-tests/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

10
src/libfetchers-tests/meson.build
View file

@ -14,7 +14,7 @@ project('nix-fetchers-tests', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
dependency('nix-store-test-support'), dependency('nix-store-test-support'),
@ -22,10 +22,10 @@ deps_private_maybe_subproject = [
] ]
deps_public_maybe_subproject = [ deps_public_maybe_subproject = [
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_private += rapidcheck deps_private += rapidcheck
@ -42,7 +42,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'public-key.cc', 'public-key.cc',

1
src/libfetchers-tests/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libfetchers-tests/package.nix
View file

@ -26,8 +26,8 @@ mkMesonExecutable (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libfetchers/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

8
src/libfetchers/meson.build
View file

@ -14,7 +14,7 @@ project('nix-fetchers', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -24,7 +24,7 @@ deps_public_maybe_subproject = [
dependency('nix-util'), dependency('nix-util'),
dependency('nix-store'), dependency('nix-store'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
nlohmann_json = dependency('nlohmann_json', version : '>= 3.9') nlohmann_json = dependency('nlohmann_json', version : '>= 3.9')
deps_public += nlohmann_json deps_public += nlohmann_json
@ -41,7 +41,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'attrs.cc', 'attrs.cc',
@ -90,4 +90,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libfetchers/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libfetchers/package.nix
View file

@ -22,8 +22,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libflake-c/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson/

12
src/libflake-c/meson.build
View file

@ -14,7 +14,7 @@ project('nix-flake-c', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -29,7 +29,7 @@ deps_public_maybe_subproject = [
dependency('nix-store-c'), dependency('nix-store-c'),
dependency('nix-expr-c'), dependency('nix-expr-c'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
# TODO rename, because it will conflict with downstream projects # TODO rename, because it will conflict with downstream projects
configdata.set_quoted('PACKAGE_VERSION', meson.project_version()) configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
@ -58,7 +58,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'nix_api_flake.cc', 'nix_api_flake.cc',
@ -73,8 +73,8 @@ headers = [config_h] + files(
# TODO move this header to libexpr, maybe don't use it in tests? # TODO move this header to libexpr, maybe don't use it in tests?
headers += files('nix_api_flake.h') headers += files('nix_api_flake.h')
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixflakec', 'nixflakec',
@ -90,4 +90,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libflake-c/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libflake-c/package.nix
View file

@ -21,8 +21,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libflake-tests/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

10
src/libflake-tests/meson.build
View file

@ -14,7 +14,7 @@ project('nix-flake-tests', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
dependency('nix-expr-test-support'), dependency('nix-expr-test-support'),
@ -23,10 +23,10 @@ deps_private_maybe_subproject = [
] ]
deps_public_maybe_subproject = [ deps_public_maybe_subproject = [
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_private += rapidcheck deps_private += rapidcheck
@ -43,7 +43,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'flakeref.cc', 'flakeref.cc',

1
src/libflake-tests/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libflake-tests/package.nix
View file

@ -27,8 +27,8 @@ mkMesonExecutable (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libflake/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

8
src/libflake/meson.build
View file

@ -14,7 +14,7 @@ project('nix-flake', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
] ]
@ -24,7 +24,7 @@ deps_public_maybe_subproject = [
dependency('nix-fetchers'), dependency('nix-fetchers'),
dependency('nix-expr'), dependency('nix-expr'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
nlohmann_json = dependency('nlohmann_json', version : '>= 3.9') nlohmann_json = dependency('nlohmann_json', version : '>= 3.9')
deps_public += nlohmann_json deps_public += nlohmann_json
@ -39,7 +39,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'flake/config.cc', 'flake/config.cc',
@ -72,4 +72,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libflake/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libflake/package.nix
View file

@ -23,8 +23,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libmain-c/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

12
src/libmain-c/meson.build
View file

@ -14,7 +14,7 @@ project('nix-main-c', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -27,7 +27,7 @@ deps_public_maybe_subproject = [
dependency('nix-util-c'), dependency('nix-util-c'),
dependency('nix-store-c'), dependency('nix-store-c'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
# TODO rename, because it will conflict with downstream projects # TODO rename, because it will conflict with downstream projects
configdata.set_quoted('PACKAGE_VERSION', meson.project_version()) configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
@ -53,7 +53,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'nix_api_main.cc', 'nix_api_main.cc',
@ -65,8 +65,8 @@ headers = [config_h] + files(
'nix_api_main.h', 'nix_api_main.h',
) )
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixmainc', 'nixmainc',
@ -82,4 +82,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libmain-c/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libmain-c/package.nix
View file

@ -22,8 +22,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libmain/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

8
src/libmain/meson.build
View file

@ -14,7 +14,7 @@ project('nix-main', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -24,7 +24,7 @@ deps_public_maybe_subproject = [
dependency('nix-util'), dependency('nix-util'),
dependency('nix-store'), dependency('nix-store'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
pubsetbuf_test = ''' pubsetbuf_test = '''
#include <iostream> #include <iostream>
@ -58,7 +58,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'common-args.cc', 'common-args.cc',
@ -96,4 +96,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libmain/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libmain/package.nix
View file

@ -22,8 +22,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libstore-c/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

12
src/libstore-c/meson.build
View file

@ -14,7 +14,7 @@ project('nix-store-c', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -25,7 +25,7 @@ deps_private_maybe_subproject = [
deps_public_maybe_subproject = [ deps_public_maybe_subproject = [
dependency('nix-util-c'), dependency('nix-util-c'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
# TODO rename, because it will conflict with downstream projects # TODO rename, because it will conflict with downstream projects
configdata.set_quoted('PACKAGE_VERSION', meson.project_version()) configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
@ -49,7 +49,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'nix_api_store.cc', 'nix_api_store.cc',
@ -64,8 +64,8 @@ headers = [config_h] + files(
# TODO don't install this once tests don't use it and/or move the header into `libstore`, non-`c` # TODO don't install this once tests don't use it and/or move the header into `libstore`, non-`c`
headers += files('nix_api_store_internal.h') headers += files('nix_api_store_internal.h')
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixstorec', 'nixstorec',
@ -81,4 +81,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libstore-c/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libstore-c/package.nix
View file

@ -20,8 +20,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libstore-test-support/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

12
src/libstore-test-support/meson.build
View file

@ -14,7 +14,7 @@ project('nix-store-test-support', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
] ]
@ -24,7 +24,7 @@ deps_public_maybe_subproject = [
dependency('nix-store'), dependency('nix-store'),
dependency('nix-store-c'), dependency('nix-store-c'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_public += rapidcheck deps_public += rapidcheck
@ -37,7 +37,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'tests/derived-path.cc', 'tests/derived-path.cc',
@ -56,8 +56,8 @@ headers = files(
'tests/protocol.hh', 'tests/protocol.hh',
) )
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nix-store-test-support', 'nix-store-test-support',
@ -75,4 +75,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libstore-test-support/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libstore-test-support/package.nix
View file

@ -23,8 +23,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libstore-tests/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

10
src/libstore-tests/meson.build
View file

@ -14,7 +14,7 @@ project('nix-store-tests', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
dependency('nix-store'), dependency('nix-store'),
@ -23,10 +23,10 @@ deps_private_maybe_subproject = [
] ]
deps_public_maybe_subproject = [ deps_public_maybe_subproject = [
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
sqlite = dependency('sqlite3', 'sqlite', version : '>=3.6.19') sqlite = dependency('sqlite3', 'sqlite', version : '>=3.6.19')
deps_private += sqlite deps_private += sqlite
@ -50,7 +50,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'common-protocol.cc', 'common-protocol.cc',

1
src/libstore-tests/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libstore-tests/package.nix
View file

@ -28,8 +28,8 @@ mkMesonExecutable (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libstore/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

16
src/libstore/meson.build
View file

@ -15,7 +15,7 @@ project('nix-store', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -29,7 +29,7 @@ deps_private_maybe_subproject = [
deps_public_maybe_subproject = [ deps_public_maybe_subproject = [
dependency('nix-util'), dependency('nix-util'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
run_command('ln', '-s', run_command('ln', '-s',
meson.project_build_root() / '__nothing_link_target', meson.project_build_root() / '__nothing_link_target',
@ -81,7 +81,7 @@ if host_machine.system() == 'windows'
deps_other += [wsock32] deps_other += [wsock32]
endif endif
subdir('build-utils-meson/libatomic') subdir('nix-meson-build-support/libatomic')
boost = dependency( boost = dependency(
'boost', 'boost',
@ -131,7 +131,7 @@ if aws_s3.found()
endif endif
deps_other += aws_s3 deps_other += aws_s3
subdir('build-utils-meson/generate-header') subdir('nix-meson-build-support/generate-header')
generated_headers = [] generated_headers = []
foreach header : [ foreach header : [
@ -179,7 +179,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'binary-cache-store.cc', 'binary-cache-store.cc',
@ -416,8 +416,8 @@ foreach name, value : cpp_str_defines
] ]
endforeach endforeach
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixstore', 'nixstore',
@ -446,4 +446,4 @@ if host_machine.system() != 'darwin'
} }
endif endif
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libstore/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libstore/package.nix
View file

@ -32,8 +32,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libutil-c/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

12
src/libutil-c/meson.build
View file

@ -14,7 +14,7 @@ project('nix-util-c', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -23,7 +23,7 @@ deps_private_maybe_subproject = [
] ]
deps_public_maybe_subproject = [ deps_public_maybe_subproject = [
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
# TODO rename, because it will conflict with downstream projects # TODO rename, because it will conflict with downstream projects
configdata.set_quoted('PACKAGE_VERSION', meson.project_version()) configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
@ -45,7 +45,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'nix_api_util.cc', 'nix_api_util.cc',
@ -60,8 +60,8 @@ headers = [config_h] + files(
# TODO don't install this once tests don't use it. # TODO don't install this once tests don't use it.
headers += files('nix_api_util_internal.h') headers += files('nix_api_util_internal.h')
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixutilc', 'nixutilc',
@ -77,4 +77,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libutil-c/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libutil-c/package.nix
View file

@ -19,8 +19,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libutil-test-support/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

12
src/libutil-test-support/meson.build
View file

@ -14,7 +14,7 @@ project('nix-util-test-support', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
] ]
@ -22,7 +22,7 @@ deps_public_maybe_subproject = [
dependency('nix-util'), dependency('nix-util'),
dependency('nix-util-c'), dependency('nix-util-c'),
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_public += rapidcheck deps_public += rapidcheck
@ -34,7 +34,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'tests/hash.cc', 'tests/hash.cc',
@ -51,8 +51,8 @@ headers = files(
'tests/string_callback.hh', 'tests/string_callback.hh',
) )
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nix-util-test-support', 'nix-util-test-support',
@ -70,4 +70,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libutil-test-support/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libutil-test-support/package.nix
View file

@ -22,8 +22,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libutil-tests/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

10
src/libutil-tests/meson.build
View file

@ -14,7 +14,7 @@ project('nix-util-tests', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
dependency('nix-util'), dependency('nix-util'),
@ -23,10 +23,10 @@ deps_private_maybe_subproject = [
] ]
deps_public_maybe_subproject = [ deps_public_maybe_subproject = [
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_private += rapidcheck deps_private += rapidcheck
@ -42,7 +42,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'args.cc', 'args.cc',

1
src/libutil-tests/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libutil-tests/package.nix
View file

@ -26,8 +26,8 @@ mkMesonExecutable (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/libutil/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson

14
src/libutil/meson.build
View file

@ -14,7 +14,7 @@ project('nix-util', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -22,7 +22,7 @@ deps_private_maybe_subproject = [
] ]
deps_public_maybe_subproject = [ deps_public_maybe_subproject = [
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
# Check for each of these functions, and create a define like `#define # Check for each of these functions, and create a define like `#define
# HAVE_LUTIMES 1`. The `#define` is unconditional, 0 for not found and 1 # HAVE_LUTIMES 1`. The `#define` is unconditional, 0 for not found and 1
@ -53,7 +53,7 @@ endforeach
configdata.set('HAVE_DECL_AT_SYMLINK_NOFOLLOW', cxx.has_header_symbol('fcntl.h', 'AT_SYMLINK_NOFOLLOW').to_int()) configdata.set('HAVE_DECL_AT_SYMLINK_NOFOLLOW', cxx.has_header_symbol('fcntl.h', 'AT_SYMLINK_NOFOLLOW').to_int())
subdir('build-utils-meson/libatomic') subdir('nix-meson-build-support/libatomic')
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
socket = cxx.find_library('ws2_32') socket = cxx.find_library('ws2_32')
@ -120,7 +120,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
sources = files( sources = files(
'archive.cc', 'archive.cc',
@ -256,8 +256,8 @@ else
subdir('unix') subdir('unix')
endif endif
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
this_library = library( this_library = library(
'nixutil', 'nixutil',
@ -278,4 +278,4 @@ if host_machine.system() == 'windows'
libraries_private += ['-lws2_32'] libraries_private += ['-lws2_32']
endif endif
subdir('build-utils-meson/export') subdir('nix-meson-build-support/export')

1
src/libutil/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/libutil/package.nix
View file

@ -25,8 +25,8 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build

1
src/nix/build-utils-meson
View file

@ -1 +0,0 @@
../../build-utils-meson/

12
src/nix/meson.build
View file

@ -15,7 +15,7 @@ project('nix', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('build-utils-meson/deps-lists') subdir('nix-meson-build-support/deps-lists')
nix_store = dependency('nix-store') nix_store = dependency('nix-store')
@ -30,10 +30,10 @@ deps_private_maybe_subproject = [
] ]
deps_public_maybe_subproject = [ deps_public_maybe_subproject = [
] ]
subdir('build-utils-meson/subprojects') subdir('nix-meson-build-support/subprojects')
subdir('build-utils-meson/export-all-symbols') subdir('nix-meson-build-support/export-all-symbols')
subdir('build-utils-meson/windows-version') subdir('nix-meson-build-support/windows-version')
configdata = configuration_data() configdata = configuration_data()
@ -63,8 +63,8 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('build-utils-meson/common') subdir('nix-meson-build-support/common')
subdir('build-utils-meson/generate-header') subdir('nix-meson-build-support/generate-header')
nix_sources = [config_h] + files( nix_sources = [config_h] + files(
'add-to-store.cc', 'add-to-store.cc',

1
src/nix/nix-meson-build-support Symbolic link
View file

@ -0,0 +1 @@
../../nix-meson-build-support

4
src/nix/package.nix
View file

@ -22,8 +22,8 @@ mkMesonExecutable (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions ([ fileset = fileset.unions ([
../../build-utils-meson ../../nix-meson-build-support
./build-utils-meson ./nix-meson-build-support
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build