Changeset 00e6288 in mainline

Timestamp:

2024-01-05T14:10:56Z (11 months ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

master, topic/simplify-dev-export

Children:

7b907a0a

Parents:

de96d3b

git-author:

Vojtech Horky <vojtech.horky@…> (2024-01-05 13:50:59)

git-committer:

Vojtech Horky <vojtech.horky@…> (2024-01-05 14:10:56)

Message:

Add export-dev target to export all libraries

The new target export-dev builds all libraries and copies the created .a
archives and library headers to export-dev subdirectory.

Unlike the existing approach from tools/export.sh we do not list the
libraries manually but copy all of them automatically. This simplifies
maintenance when new library is added and it should also simplify
coastline builds as no change to HelenOS tree would be needed when the
ported software needs another library not yet mentioned in export.sh.

The approach relies as much on Meson to do the heavy-lifting as possible
and the invoked shell script merely copies the files (seems that Meson
is not able to do that by itself inside a target). The script honors
exported DESTDIR variable if set and ensures thin archives are converted
before export.

Files:

• meson.build (modified) (1 diff)
• meson/part/exports/copy-export.sh (added)
• meson/part/exports/meson.build (modified) (1 diff)
• uspace/lib/c/meson.build (modified) (1 diff)
• uspace/lib/meson.build (modified) (2 diffs)
• uspace/lib/posix/meson.build (modified) (1 diff)

meson.build

@@ -72 +72 @@
 install_files = []
 install_deps = []
+
+# Exported libraries and include files
+# Format: [ type, source_file, destination ]
+# See meson/part/exports/copy-export.sh for supported file types.
+exported_devel_files = []
+
 # Install script for headers.
 # TODO: Make a list of directories and turn into script later.

meson/part/exports/meson.build

@@ -85 +85 @@
         capture: true,
 )
+
+run_target('export-dev',
+    command: [
+        sh,
+        meson.source_root() / 'meson' / 'part' / 'exports' / 'copy-export.sh',
+    ] + [
+        'config', config_mk, 'config.mk',
+        'config', config_sh, 'config.sh',
+    ] + exported_devel_files
+)

uspace/lib/c/meson.build

@@ -53 +53 @@
         _sdir = meson.current_source_dir() / idir
         uspace_lib_devel_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/libc"'.format(_sdir)
+        exported_devel_files += ['include', _sdir, 'libc']
 endforeach
 

uspace/lib/meson.build

@@ -180 +180 @@
                 if run_command('[', '-d', incdir, ']').returncode() == 0
                         includes += include_directories(incdir)
+                        _sdir = meson.current_source_dir() / l / 'include'
 
                         if installed_libs.contains(l)
-                                _sdir = meson.current_source_dir() / l / 'include'
                                 uspace_lib_devel_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/lib@1@"'.format(_sdir, l)
                         endif
+
+                        exported_devel_files += ['include', _sdir, 'lib' + l]
                 else
                         includes += include_directories(l)
@@ -293 +295 @@
                         install_deps += [ _static_lib ]
                 endif
+
+                exported_devel_files += ['staticlib', _static_lib, 'lib' + l + '.a']
 
                 _static_dep = declare_dependency(

uspace/lib/posix/meson.build

@@ -67 +67 @@
 uspace_lib_devel_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/libposix"'.format(_sdir)
 uspace_lib_devel_install_script_text += 'ln -s -r "${DESTDIR}include/libc" "${DESTDIR}/include/common"'
+
+exported_devel_files += [ 'include', meson.current_source_dir() / 'include' / 'posix', 'libposix' ]
+exported_devel_files += [ 'includesymlink', 'libc', 'libposix' ]