fix(headers): moved all headers to fourdst/

assets/static/atomic/README.md

@@ -1 +0,0 @@
-Use the utility `utils/atomic/convertWeightsToHeader.py` to generate atomicWeights.h

assets/static/atomic/meson.build

@@ -1,16 +0,0 @@
-required_headers = [
-    'atomicSpecies.h',
-    'species.h'
-]
-
-foreach h : required_headers
-    if not cpp.has_header(h, include_directories: include_directories('include'))
-        error('SERiF requires the header file ' + h + ' to be present in the assets/static/atomic/include directory.')
-    endif
-endforeach
-
-species_weight_dep = declare_dependency(
-    include_directories: include_directories('include'),
-)
-
-message('✅ SERiF species_weight dependency declared')

assets/static/meson.build

@@ -1 +0,0 @@
-subdir('atomic')

meson.build

@@ -18,14 +18,13 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 # *********************************************************************** #
-project('libcomposition', 'cpp', version: 'v1.0.5', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
+project('libcomposition', 'cpp', version: 'v1.0.6', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
 
 # Add default visibility for all C++ targets
 add_project_arguments('-fvisibility=default', language: 'cpp')
 
 cpp = meson.get_compiler('cpp')
 subdir('build-config')
-subdir('assets/static')
 subdir('src')
 subdir('tests')
 

src/composition/include/fourdst/composition/atomicSpecies.h

@@ -3,7 +3,6 @@
 #include <string_view>
 #include <string>
 #include <iostream>
-#include "atomicSpecies.h"
 
 namespace fourdst::atomic {
     struct Species {

src/composition/include/fourdst/composition/composition.h

@@ -27,10 +27,9 @@
 
 #include <utility>
 
-#include "config.h"
+#include "fourdst/config/config.h"
-#include "logging.h"
+#include "fourdst/logging/logging.h"
-
+#include "fourdst/composition/atomicSpecies.h"
-#include "atomicSpecies.h"
 
 namespace fourdst::composition {
     struct CanonicalComposition {

src/composition/include/fourdst/composition/species.h

@@ -2,7 +2,8 @@
 #include <unordered_map>
 #include <string_view>
 #include <string>
-#include "atomicSpecies.h"
+
+#include "fourdst/composition/atomicSpecies.h"
 
 namespace fourdst::atomic {
     static const Species n_1("n-1", "n", 1, 1, 0, 1, 0.0, "B-", 782.347, 1.0086649159, 0.00047);

src/composition/lib/composition.cpp

@@ -18,8 +18,6 @@
 //   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
 // *********************************************************************** */
-#include "composition.h"
-#include "const.h"
 #include "quill/LogMacros.h"
 
 #include <stdexcept>
@@ -30,8 +28,10 @@
 
 #include <utility>
 
-#include "atomicSpecies.h"
+#include "fourdst/composition/atomicSpecies.h"
-#include "species.h"
+#include "fourdst/composition/species.h"
+#include "fourdst/composition/composition.h"
+#include "fourdst/constants/const.h"
 
 namespace fourdst::composition {
 

src/composition/meson.build

@@ -1,12 +1,26 @@
-# Define the library
+required_headers = [
-composition_sources = files(
+    'fourdst/composition/atomicSpecies.h',
-  'private/composition.cpp',
+    'fourdst/composition/species.h',
+    'fourdst/composition/composition.h'
+]
+
+foreach h : required_headers
+    if not cpp.has_header(h, include_directories: include_directories('include'))
+        error('libcomposition requires the header file ' + h + ' to be present in the fourdst/composition directory.')
+    endif
+endforeach
+
+species_weight_dep = declare_dependency(
+    include_directories: include_directories('include'),
 )
 
-composition_headers = files(
+message('✅ libcomposition species_weight dependency declared')
-    'public/composition.h'
+
+composition_sources = files(
+  'lib/composition.cpp',
 )
 
+
 dependencies = [
     species_weight_dep,
     const_dep,
@@ -17,17 +31,20 @@ dependencies = [
 # Define the libcomposition library so it can be linked against by other parts of the build system
 libcomposition = library('composition',
     composition_sources, 
-    include_directories: include_directories('public'),
     cpp_args: ['-fvisibility=default'],
     dependencies: dependencies,
     install : true)
 
 composition_dep = declare_dependency(
-    include_directories: include_directories('public'),
     link_with: libcomposition,
     dependencies: dependencies,
     sources: composition_sources,
 )
 
 # Make headers accessible
+composition_headers = files(
+  'include/fourdst/composition/composition.h',
+  'include/fourdst/composition/atomicSpecies.h',
+  'include/fourdst/composition/species.h'
+)
 install_headers(composition_headers, subdir : 'fourdst/fourdst/composition')

subprojects/libconfig.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/4D-STAR/libconfig.git
-revision = v1.0.3
+revision = v1.0.6
 depth = 1
 
 [provide]

subprojects/libconstants.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/4D-STAR/libconstants.git
-revision = v1.0.5
+revision = v1.0.6
 depth = 1
 
 [provide]

subprojects/liblogging.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/4D-STAR/liblogging.git
-revision = v1.0.5
+revision = v1.0.6
 depth = 1
 
 [provide]

tests/composition/compositionTest.cpp

@@ -3,10 +3,11 @@
 #include <string>
 #include <algorithm>
 
-#include "atomicSpecies.h"
+#include "fourdst/composition/atomicSpecies.h"
-#include "species.h"
+#include "fourdst/composition/species.h"
-#include "composition.h"
+#include "fourdst/composition/composition.h"
-#include "config.h"
+
+#include "fourdst/config/config.h"
 
 std::string EXAMPLE_FILENAME = std::string(getenv("MESON_SOURCE_ROOT")) + "/tests/config/example.yaml";