libnixf: flatten libnixf/lib/meson.build, to a single library (#300)

nix-community · Jan 16, 2024 · 9194fc4 · 9194fc4
2 parents 09999bc + a5547b2
commit 9194fc4
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 108 deletions.
diff --git a/libnixf/default.nix b/libnixf/default.nix
diff --git a/libnixf/lib/Basic/meson.build b/libnixf/lib/Basic/meson.build
diff --git a/libnixf/lib/Parse/meson.build b/libnixf/lib/Parse/meson.build
diff --git a/libnixf/lib/meson.build b/libnixf/lib/meson.build
diff --git a/libnixf/meson.build b/libnixf/meson.build
@@ -1,5 +1,39 @@
-nixf_inc = include_directories('include')
+libnixf_deps = [ ]
 
-subdir('lib')
+libnixf_inc = include_directories('include')
 
-install_subdir('include', install_dir : 'include')
+libnixf = library(
+    'nixf',
+    'src/Basic/Diagnostic.cpp',
+    'src/Parse/Lexer.cpp',
+    'src/Parse/Parser.cpp',
+    include_directories: libnixf_inc,
+    dependencies: libnixf_deps,
+    install: true,
+    cpp_args: [ '-Werror=implicit-fallthrough' ]
+)
+
+pkgconfig.generate(
+    name: 'libnixf',
+    version: 'nightly',
+    description: 'libnixf',
+    libraries: libnixf
+)
+
+nixf = declare_dependency(
+    include_directories: libnixf_inc,
+    link_with: libnixf,
+    dependencies: libnixf_deps
+)
+
+test('unit/libnixf/Parse',
+    executable('unit-libnixf-parse',
+        'test/Parse/Lexer.cpp',
+        'test/Parse/Parser.cpp',
+        dependencies: [ nixf, gtest_main ],
+        include_directories: [ 'src/Parse' ] # Private headers
+    )
+)
+
+
+install_subdir('include/nixf', install_dir: 'include')
diff --git a/libnixf/lib/Basic/Diagnostic.cpp → libnixf/src/Basic/Diagnostic.cpp b/libnixf/lib/Basic/Diagnostic.cpp → libnixf/src/Basic/Diagnostic.cpp
diff --git a/libnixf/lib/Parse/Lexer.cpp → libnixf/src/Parse/Lexer.cpp b/libnixf/lib/Parse/Lexer.cpp → libnixf/src/Parse/Lexer.cpp
diff --git a/libnixf/lib/Parse/Lexer.h → libnixf/src/Parse/Lexer.h b/libnixf/lib/Parse/Lexer.h → libnixf/src/Parse/Lexer.h
diff --git a/libnixf/lib/Parse/Parser.cpp → libnixf/src/Parse/Parser.cpp b/libnixf/lib/Parse/Parser.cpp → libnixf/src/Parse/Parser.cpp
diff --git a/libnixf/lib/Parse/Token.h → libnixf/src/Parse/Token.h b/libnixf/lib/Parse/Token.h → libnixf/src/Parse/Token.h
diff --git a/libnixf/lib/Parse/TokenKinds.inc → libnixf/src/Parse/TokenKinds.inc b/libnixf/lib/Parse/TokenKinds.inc → libnixf/src/Parse/TokenKinds.inc
diff --git a/libnixf/lib/Parse/Tokens.inc → libnixf/src/Parse/Tokens.inc b/libnixf/lib/Parse/Tokens.inc → libnixf/src/Parse/Tokens.inc
diff --git a/libnixf/lib/Parse/test/Lexer.cpp → libnixf/test/Parse/Lexer.cpp b/libnixf/lib/Parse/test/Lexer.cpp → libnixf/test/Parse/Lexer.cpp
diff --git a/libnixf/lib/Parse/test/Parser.cpp → libnixf/test/Parse/Parser.cpp b/libnixf/lib/Parse/test/Parser.cpp → libnixf/test/Parse/Parser.cpp