NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

Rename file to avoid reserved name

Browse source
This commit is contained in:
John Ericson 2024-06-27 18:28:13 -04:00
parent 79e0ef88bf
commit 6a0582d9fd
59 changed files with 95 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

0
meson-utils/diagnostics/meson.build → build-utils-meson/diagnostics/meson.build
View file

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

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

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

0
meson-utils/threads/meson.build → build-utils-meson/threads/meson.build
View file

4
meson.build
View file

@ -13,8 +13,8 @@ subproject('libexpr')
subproject('libflake') subproject('libflake')
# Docs # Docs
subproject('internal-api-docs') #subproject('internal-api-docs')
subproject('external-api-docs') #subproject('external-api-docs')
# C wrappers # C wrappers
subproject('libutil-c') subproject('libutil-c')

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

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

1
src/libcmd/meson-utils
View file

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

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

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

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

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

10
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('meson-utils/deps-lists') subdir('build-utils-meson/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('meson-utils/subprojects') subdir('build-utils-meson/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('meson-utils/diagnostics') subdir('build-utils-meson/diagnostics')
sources = files( sources = files(
'nix_api_expr.cc', 'nix_api_expr.cc',
@ -69,7 +69,7 @@ headers = [config_h] + files(
'nix_api_value.h', 'nix_api_value.h',
) )
subdir('meson-utils/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
this_library = library( this_library = library(
'nixexprc', 'nixexprc',
@ -84,4 +84,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('meson-utils/export') subdir('build-utils-meson/export')

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

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

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

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

10
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('meson-utils/deps-lists') subdir('build-utils-meson/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
] ]
@ -25,7 +25,7 @@ deps_public_maybe_subproject = [
dependency('nix-store-test-support'), dependency('nix-store-test-support'),
dependency('nix-expr'), dependency('nix-expr'),
] ]
subdir('meson-utils/subprojects') subdir('build-utils-meson/subprojects')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_public += rapidcheck deps_public += rapidcheck
@ -39,7 +39,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('meson-utils/diagnostics') subdir('build-utils-meson/diagnostics')
sources = files( sources = files(
'tests/value/context.cc', 'tests/value/context.cc',
@ -53,7 +53,7 @@ headers = files(
'tests/value/context.hh', 'tests/value/context.hh',
) )
subdir('meson-utils/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
this_library = library( this_library = library(
'nix-expr-test-support', 'nix-expr-test-support',
@ -70,4 +70,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('meson-utils/export') subdir('build-utils-meson/export')

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

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

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

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

8
src/libexpr-test/meson.build
View file

@ -14,7 +14,7 @@ project('nix-expr-test', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('meson-utils/deps-lists') subdir('build-utils-meson/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
] ]
@ -29,9 +29,9 @@ deps_public_maybe_subproject = [
dependency('nix-expr-c'), dependency('nix-expr-c'),
dependency('nix-expr-test-support'), dependency('nix-expr-test-support'),
] ]
subdir('meson-utils/subprojects') subdir('build-utils-meson/subprojects')
subdir('meson-utils/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_private += rapidcheck deps_private += rapidcheck
@ -54,7 +54,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('meson-utils/diagnostics') subdir('build-utils-meson/diagnostics')
sources = files( sources = files(
'derived-path.cc', 'derived-path.cc',

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

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

1
src/libexpr/meson-utils
View file

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

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('meson-utils/deps-lists') subdir('build-utils-meson/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -25,9 +25,9 @@ deps_public_maybe_subproject = [
dependency('nix-store'), dependency('nix-store'),
dependency('nix-fetchers'), dependency('nix-fetchers'),
] ]
subdir('meson-utils/subprojects') subdir('build-utils-meson/subprojects')
subdir('meson-utils/threads') subdir('build-utils-meson/threads')
boost = dependency( boost = dependency(
'boost', 'boost',
@ -69,7 +69,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('meson-utils/diagnostics') subdir('build-utils-meson/diagnostics')
parser_tab = custom_target( parser_tab = custom_target(
input : 'parser.y', input : 'parser.y',
@ -201,4 +201,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('meson-utils/export') subdir('build-utils-meson/export')

1
src/libfetchers-test/build-utils-meson Symbolic link
View file

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

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

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

8
src/libfetchers-test/meson.build
View file

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

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

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

1
src/libfetchers/meson-utils
View file

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

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('meson-utils/deps-lists') subdir('build-utils-meson/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('meson-utils/subprojects') subdir('build-utils-meson/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('meson-utils/diagnostics') subdir('build-utils-meson/diagnostics')
sources = files( sources = files(
'attrs.cc', 'attrs.cc',
@ -89,4 +89,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('meson-utils/export') subdir('build-utils-meson/export')

1
src/libflake-test/build-utils-meson Symbolic link
View file

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

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

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

8
src/libflake-test/meson.build
View file

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

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

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

1
src/libflake/meson-utils
View file

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

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('meson-utils/deps-lists') subdir('build-utils-meson/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('meson-utils/subprojects') subdir('build-utils-meson/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
@ -42,7 +42,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('meson-utils/diagnostics') subdir('build-utils-meson/diagnostics')
sources = files( sources = files(
'flake-settings.cc', 'flake-settings.cc',
@ -74,4 +74,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('meson-utils/export') subdir('build-utils-meson/export')

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

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

1
src/libmain/meson-utils
View file

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

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

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

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

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

10
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('meson-utils/deps-lists') subdir('build-utils-meson/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('meson-utils/subprojects') subdir('build-utils-meson/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('meson-utils/diagnostics') subdir('build-utils-meson/diagnostics')
sources = files( sources = files(
'nix_api_store.cc', 'nix_api_store.cc',
@ -61,7 +61,7 @@ headers = [config_h] + files(
'nix_api_store.h', 'nix_api_store.h',
) )
subdir('meson-utils/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
this_library = library( this_library = library(
'nixstorec', 'nixstorec',
@ -76,4 +76,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('meson-utils/export') subdir('build-utils-meson/export')

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

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

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

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

10
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('meson-utils/deps-lists') subdir('build-utils-meson/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
] ]
@ -23,7 +23,7 @@ deps_public_maybe_subproject = [
dependency('nix-util-test-support'), dependency('nix-util-test-support'),
dependency('nix-store'), dependency('nix-store'),
] ]
subdir('meson-utils/subprojects') subdir('build-utils-meson/subprojects')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_public += rapidcheck deps_public += rapidcheck
@ -36,7 +36,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('meson-utils/diagnostics') subdir('build-utils-meson/diagnostics')
sources = files( sources = files(
'tests/derived-path.cc', 'tests/derived-path.cc',
@ -55,7 +55,7 @@ headers = files(
'tests/protocol.hh', 'tests/protocol.hh',
) )
subdir('meson-utils/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
this_library = library( this_library = library(
'nix-store-test-support', 'nix-store-test-support',
@ -72,4 +72,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('meson-utils/export') subdir('build-utils-meson/export')

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

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

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

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

8
src/libstore-test/meson.build
View file

@ -14,7 +14,7 @@ project('nix-store-test', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('meson-utils/deps-lists') subdir('build-utils-meson/deps-lists')
deps_private_maybe_subproject = [ deps_private_maybe_subproject = [
] ]
@ -26,9 +26,9 @@ deps_public_maybe_subproject = [
dependency('nix-store-c'), dependency('nix-store-c'),
dependency('nix-store-test-support'), dependency('nix-store-test-support'),
] ]
subdir('meson-utils/subprojects') subdir('build-utils-meson/subprojects')
subdir('meson-utils/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_private += rapidcheck deps_private += rapidcheck
@ -49,7 +49,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('meson-utils/diagnostics') subdir('build-utils-meson/diagnostics')
sources = files( sources = files(
'common-protocol.cc', 'common-protocol.cc',

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

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

1
src/libstore/meson-utils
View file

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

12
src/libstore/meson.build
View file

@ -14,7 +14,7 @@ project('nix-store', 'cpp',
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
subdir('meson-utils/deps-lists') subdir('build-utils-meson/deps-lists')
configdata = configuration_data() configdata = configuration_data()
@ -28,7 +28,7 @@ deps_private_maybe_subproject = [
deps_public_maybe_subproject = [ deps_public_maybe_subproject = [
dependency('nix-util'), dependency('nix-util'),
] ]
subdir('meson-utils/subprojects') subdir('build-utils-meson/subprojects')
run_command('ln', '-s', run_command('ln', '-s',
meson.project_build_root() / '__nothing_link_target', meson.project_build_root() / '__nothing_link_target',
@ -67,7 +67,7 @@ has_acl_support = cxx.has_header('sys/xattr.h') \
and cxx.has_function('lremovexattr') and cxx.has_function('lremovexattr')
configdata.set('HAVE_ACL_SUPPORT', has_acl_support.to_int()) configdata.set('HAVE_ACL_SUPPORT', has_acl_support.to_int())
subdir('meson-utils/threads') subdir('build-utils-meson/threads')
boost = dependency( boost = dependency(
'boost', 'boost',
@ -153,7 +153,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('meson-utils/diagnostics') subdir('build-utils-meson/diagnostics')
sources = files( sources = files(
'binary-cache-store.cc', 'binary-cache-store.cc',
@ -385,7 +385,7 @@ foreach name, value : cpp_str_defines
] ]
endforeach endforeach
subdir('meson-utils/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
this_library = library( this_library = library(
'nixstore', 'nixstore',
@ -402,4 +402,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('meson-utils/export') subdir('build-utils-meson/export')

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

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

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

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

10
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('meson-utils/deps-lists') subdir('build-utils-meson/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('meson-utils/subprojects') subdir('build-utils-meson/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('meson-utils/diagnostics') subdir('build-utils-meson/diagnostics')
sources = files( sources = files(
'nix_api_util.cc', 'nix_api_util.cc',
@ -57,7 +57,7 @@ headers = [config_h] + files(
'nix_api_util.h', 'nix_api_util.h',
) )
subdir('meson-utils/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
this_library = library( this_library = library(
'nixutilc', 'nixutilc',
@ -72,4 +72,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = [] libraries_private = []
subdir('meson-utils/export') subdir('build-utils-meson/export')

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

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

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

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

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

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

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

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

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

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

8
src/libutil-test/meson.build
View file

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

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

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

1
src/libutil/meson-utils
View file

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

12
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('meson-utils/deps-lists') subdir('build-utils-meson/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('meson-utils/subprojects') subdir('build-utils-meson/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
@ -48,7 +48,7 @@ foreach funcspec : check_funcs
configdata.set(define_name, define_value) configdata.set(define_name, define_value)
endforeach endforeach
subdir('meson-utils/threads') subdir('build-utils-meson/threads')
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
socket = cxx.find_library('ws2_32') socket = cxx.find_library('ws2_32')
@ -114,7 +114,7 @@ add_project_arguments(
language : 'cpp', language : 'cpp',
) )
subdir('meson-utils/diagnostics') subdir('build-utils-meson/diagnostics')
sources = files( sources = files(
'archive.cc', 'archive.cc',
@ -241,7 +241,7 @@ else
subdir('unix') subdir('unix')
endif endif
subdir('meson-utils/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
this_library = library( this_library = library(
'nixutil', 'nixutil',
@ -261,4 +261,4 @@ if host_machine.system() == 'windows'
libraries_private += ['-lws2_32'] libraries_private += ['-lws2_32']
endif endif
subdir('meson-utils/export') subdir('build-utils-meson/export')