WIP

nix-meson-build-support/export/meson.build

@@ -16,7 +16,6 @@ import('pkgconfig').generate(
   filebase : meson.project_name(),
   name : 'Nix',
   description : 'Nix Package Manager',
-  subdirs : ['nix'],
   extra_cflags : ['-std=c++2a'],
   requires : requires_public,
   requires_private : requires_private,

src/build-remote/build-remote.cc

@@ -9,19 +9,19 @@
 #include <sys/time.h>
 #endif
 
-#include "machines.hh"
-#include "shared.hh"
-#include "plugin.hh"
-#include "pathlocks.hh"
-#include "globals.hh"
-#include "serialise.hh"
-#include "build-result.hh"
-#include "store-api.hh"
-#include "strings.hh"
-#include "derivations.hh"
-#include "local-store.hh"
-#include "legacy.hh"
-#include "experimental-features.hh"
+#include "nix/machines.hh"
+#include "nix/shared.hh"
+#include "nix/plugin.hh"
+#include "nix/pathlocks.hh"
+#include "nix/globals.hh"
+#include "nix/serialise.hh"
+#include "nix/build-result.hh"
+#include "nix/store-api.hh"
+#include "nix/strings.hh"
+#include "nix/derivations.hh"
+#include "nix/local-store.hh"
+#include "nix/legacy.hh"
+#include "nix/experimental-features.hh"
 
 using namespace nix;
 using std::cin;

src/libcmd/built-path.cc

@@ -1,7 +1,7 @@
-#include "built-path.hh"
-#include "derivations.hh"
-#include "store-api.hh"
-#include "comparator.hh"
+#include "nix/built-path.hh"
+#include "nix/derivations.hh"
+#include "nix/store-api.hh"
+#include "nix/comparator.hh"
 
 #include <nlohmann/json.hpp>
 

src/libcmd/command-installable-value.cc

@@ -1,4 +1,4 @@
-#include "command-installable-value.hh"
+#include "nix/command-installable-value.hh"
 
 namespace nix {
 

src/libcmd/command.cc

@@ -1,16 +1,16 @@
 #include <algorithm>
 #include <nlohmann/json.hpp>
 
-#include "command.hh"
-#include "markdown.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
-#include "derivations.hh"
-#include "nixexpr.hh"
-#include "profiles.hh"
-#include "repl.hh"
-#include "strings.hh"
-#include "environment-variables.hh"
+#include "nix/command.hh"
+#include "nix/markdown.hh"
+#include "nix/store-api.hh"
+#include "nix/local-fs-store.hh"
+#include "nix/derivations.hh"
+#include "nix/nixexpr.hh"
+#include "nix/profiles.hh"
+#include "nix/repl.hh"
+#include "nix/strings.hh"
+#include "nix/environment-variables.hh"
 
 namespace nix {
 

src/libcmd/common-eval-args.cc

@@ -1,20 +1,20 @@
-#include "fetch-settings.hh"
-#include "eval-settings.hh"
-#include "common-eval-args.hh"
-#include "shared.hh"
-#include "config-global.hh"
-#include "filetransfer.hh"
-#include "eval.hh"
-#include "fetchers.hh"
-#include "registry.hh"
-#include "flake/flakeref.hh"
-#include "flake/settings.hh"
-#include "store-api.hh"
-#include "command.hh"
-#include "tarball.hh"
-#include "fetch-to-store.hh"
-#include "compatibility-settings.hh"
-#include "eval-settings.hh"
+#include "nix/fetch-settings.hh"
+#include "nix/eval-settings.hh"
+#include "nix/common-eval-args.hh"
+#include "nix/shared.hh"
+#include "nix/config-global.hh"
+#include "nix/filetransfer.hh"
+#include "nix/eval.hh"
+#include "nix/fetchers.hh"
+#include "nix/registry.hh"
+#include "nix/flake/flakeref.hh"
+#include "nix/flake/settings.hh"
+#include "nix/store-api.hh"
+#include "nix/command.hh"
+#include "nix/tarball.hh"
+#include "nix/fetch-to-store.hh"
+#include "nix/compatibility-settings.hh"
+#include "nix/eval-settings.hh"
 
 namespace nix {
 

src/libcmd/editor-for.cc

@@ -1,6 +1,6 @@
-#include "editor-for.hh"
-#include "environment-variables.hh"
-#include "source-path.hh"
+#include "nix/editor-for.hh"
+#include "nix/environment-variables.hh"
+#include "nix/source-path.hh"
 
 namespace nix {
 

src/libcmd/installable-attr-path.cc

@@ -1,21 +1,21 @@
-#include "globals.hh"
-#include "installable-attr-path.hh"
-#include "outputs-spec.hh"
-#include "util.hh"
-#include "command.hh"
-#include "attr-path.hh"
-#include "common-eval-args.hh"
-#include "derivations.hh"
-#include "eval-inline.hh"
-#include "eval.hh"
-#include "get-drvs.hh"
-#include "store-api.hh"
-#include "shared.hh"
-#include "flake/flake.hh"
-#include "eval-cache.hh"
-#include "url.hh"
-#include "registry.hh"
-#include "build-result.hh"
+#include "nix/globals.hh"
+#include "nix/installable-attr-path.hh"
+#include "nix/outputs-spec.hh"
+#include "nix/util.hh"
+#include "nix/command.hh"
+#include "nix/attr-path.hh"
+#include "nix/common-eval-args.hh"
+#include "nix/derivations.hh"
+#include "nix/eval-inline.hh"
+#include "nix/eval.hh"
+#include "nix/get-drvs.hh"
+#include "nix/store-api.hh"
+#include "nix/shared.hh"
+#include "nix/flake/flake.hh"
+#include "nix/eval-cache.hh"
+#include "nix/url.hh"
+#include "nix/registry.hh"
+#include "nix/build-result.hh"
 
 #include <regex>
 #include <queue>

src/libcmd/installable-derived-path.cc

@@ -1,5 +1,5 @@
-#include "installable-derived-path.hh"
-#include "derivations.hh"
+#include "nix/installable-derived-path.hh"
+#include "nix/derivations.hh"
 
 namespace nix {
 

src/libcmd/installable-flake.cc

@@ -1,22 +1,22 @@
-#include "globals.hh"
-#include "installable-flake.hh"
-#include "installable-derived-path.hh"
-#include "outputs-spec.hh"
-#include "util.hh"
-#include "command.hh"
-#include "attr-path.hh"
-#include "common-eval-args.hh"
-#include "derivations.hh"
-#include "eval-inline.hh"
-#include "eval.hh"
-#include "get-drvs.hh"
-#include "store-api.hh"
-#include "shared.hh"
-#include "flake/flake.hh"
-#include "eval-cache.hh"
-#include "url.hh"
-#include "registry.hh"
-#include "build-result.hh"
+#include "nix/globals.hh"
+#include "nix/installable-flake.hh"
+#include "nix/installable-derived-path.hh"
+#include "nix/outputs-spec.hh"
+#include "nix/util.hh"
+#include "nix/command.hh"
+#include "nix/attr-path.hh"
+#include "nix/common-eval-args.hh"
+#include "nix/derivations.hh"
+#include "nix/eval-inline.hh"
+#include "nix/eval.hh"
+#include "nix/get-drvs.hh"
+#include "nix/store-api.hh"
+#include "nix/shared.hh"
+#include "nix/flake/flake.hh"
+#include "nix/eval-cache.hh"
+#include "nix/url.hh"
+#include "nix/registry.hh"
+#include "nix/build-result.hh"
 
 #include <regex>
 #include <queue>

src/libcmd/installable-value.cc

@@ -1,6 +1,6 @@
-#include "installable-value.hh"
-#include "eval-cache.hh"
-#include "fetch-to-store.hh"
+#include "nix/installable-value.hh"
+#include "nix/eval-cache.hh"
+#include "nix/fetch-to-store.hh"
 
 namespace nix {
 

src/libcmd/installables.cc

@@ -1,33 +1,33 @@
-#include "globals.hh"
-#include "installables.hh"
-#include "installable-derived-path.hh"
-#include "installable-attr-path.hh"
-#include "installable-flake.hh"
-#include "outputs-spec.hh"
-#include "users.hh"
-#include "util.hh"
-#include "command.hh"
-#include "attr-path.hh"
-#include "common-eval-args.hh"
-#include "derivations.hh"
-#include "eval-inline.hh"
-#include "eval.hh"
-#include "eval-settings.hh"
-#include "get-drvs.hh"
-#include "store-api.hh"
-#include "shared.hh"
-#include "flake/flake.hh"
-#include "eval-cache.hh"
-#include "url.hh"
-#include "registry.hh"
-#include "build-result.hh"
+#include "nix/globals.hh"
+#include "nix/installables.hh"
+#include "nix/installable-derived-path.hh"
+#include "nix/installable-attr-path.hh"
+#include "nix/installable-flake.hh"
+#include "nix/outputs-spec.hh"
+#include "nix/users.hh"
+#include "nix/util.hh"
+#include "nix/command.hh"
+#include "nix/attr-path.hh"
+#include "nix/common-eval-args.hh"
+#include "nix/derivations.hh"
+#include "nix/eval-inline.hh"
+#include "nix/eval.hh"
+#include "nix/eval-settings.hh"
+#include "nix/get-drvs.hh"
+#include "nix/store-api.hh"
+#include "nix/shared.hh"
+#include "nix/flake/flake.hh"
+#include "nix/eval-cache.hh"
+#include "nix/url.hh"
+#include "nix/registry.hh"
+#include "nix/build-result.hh"
 
 #include <regex>
 #include <queue>
 
 #include <nlohmann/json.hpp>
 
-#include "strings-inline.hh"
+#include "nix/strings-inline.hh"
 
 namespace nix {
 

src/libcmd/legacy.cc

@@ -1,4 +1,4 @@
-#include "legacy.hh"
+#include "nix/legacy.hh"
 
 namespace nix {
 

src/libcmd/markdown.cc

@@ -1,8 +1,8 @@
-#include "markdown.hh"
-#include "environment-variables.hh"
-#include "error.hh"
-#include "finally.hh"
-#include "terminal.hh"
+#include "nix/markdown.hh"
+#include "nix/environment-variables.hh"
+#include "nix/error.hh"
+#include "nix/finally.hh"
+#include "nix/terminal.hh"
 
 #if HAVE_LOWDOWN
 #  include <sys/queue.h>

src/libcmd/meson.build

@@ -53,20 +53,15 @@ else
   error('illegal editline flavor', readline_flavor)
 endif
 
-config_h = configure_file(
-  configuration : configdata,
-  output : 'config-cmd.hh',
-)
-
 add_project_arguments(
   # TODO(Qyriad): Yes this is how the autoconf+Make system did it.
   # It would be nice for our headers to be idempotent instead.
-  '-include', 'config-util.hh',
-  '-include', 'config-store.hh',
-  # '-include', 'config-fetchers.h',
-  '-include', 'config-expr.hh',
-  '-include', 'config-main.hh',
-  '-include', 'config-cmd.hh',
+  '-include', 'nix/config-util.hh',
+  '-include', 'nix/config-store.hh',
+  # '-include', 'nix/config-fetchers.h',
+  '-include', 'nix/config-expr.hh',
+  '-include', 'nix/config-main.hh',
+  '-include', 'nix/config-cmd.hh',
   language : 'cpp',
 )
 
@@ -91,27 +86,7 @@ sources = files(
   'repl.cc',
 )
 
-include_dirs = [include_directories('.')]
-
-headers = [config_h] + files(
-  'built-path.hh',
-  'command-installable-value.hh',
-  'command.hh',
-  'common-eval-args.hh',
-  'compatibility-settings.hh',
-  'editor-for.hh',
-  'installable-attr-path.hh',
-  'installable-derived-path.hh',
-  'installable-flake.hh',
-  'installable-value.hh',
-  'installables.hh',
-  'legacy.hh',
-  'markdown.hh',
-  'misc-store-flags.hh',
-  'network-proxy.hh',
-  'repl-interacter.hh',
-  'repl.hh',
-)
+subdir('nix')
 
 this_library = library(
   'nixcmd',

src/libcmd/misc-store-flags.cc

@@ -1,4 +1,4 @@
-#include "misc-store-flags.hh"
+#include "nix/misc-store-flags.hh"
 
 namespace nix::flag
 {

src/libcmd/network-proxy.cc

@@ -1,8 +1,8 @@
-#include "network-proxy.hh"
+#include "nix/network-proxy.hh"
 
 #include <algorithm>
 
-#include "environment-variables.hh"
+#include "nix/environment-variables.hh"
 
 namespace nix {
 

src/libcmd/built-path.hh → src/libcmd/nix/built-path.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "derived-path.hh"
-#include "realisation.hh"
+#include "nix/derived-path.hh"
+#include "nix/realisation.hh"
 
 namespace nix {