Changeset 25e1490 in mainline for uspace/lib

Timestamp:

2024-01-10T11:32:40Z (2 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

5907aa4

Parents:

de96d3b (diff), 6deab5a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Vojtech Horky <vojtech.horky@…> (2024-01-10 11:32:40)

git-committer:

GitHub <noreply@…> (2024-01-10 11:32:40)

Message:

Add export-dev for exporting all libraries (see #230)

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.

The approach relies as much on Meson to do the heavy-lifting
as possible and the invoked shell script merely copies the files.
The script honors exported DESTDIR variable if set and
ensures thin archives are converted before export.

Also helenos-pkg-config was rewritten to Python for better
maintainability.

Usage:

ninja export-dev
env DESTDIR=harbour-export ninja export-dev

Location:

uspace/lib

Files:

• c/meson.build (modified) (2 diffs)
• clui/include/nchoice.h (moved) (moved from uspace/lib/clui/nchoice.h )
• clui/include/tinput.h (moved) (moved from uspace/lib/clui/tinput.h )
• clui/meson.build (modified) (1 diff)
• clui/src/nchoice.c (moved) (moved from uspace/lib/clui/nchoice.c )
• clui/src/tinput.c (moved) (moved from uspace/lib/clui/tinput.c )
• meson.build (modified) (2 diffs)
• posix/meson.build (modified) (1 diff)

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
 
@@ -209 +210 @@
         pic: false,
 )
+exported_devel_files += ['staticlib', libstartfiles, 'libstartfiles.a']
 
 if CONFIG_DEVEL_FILES

uspace/lib/clui/meson.build

@@ -29 +29 @@
 deps = [ 'clipboard', 'console' ]
 src = files(
-        'nchoice.c',
-        'tinput.c',
+        'src/nchoice.c',
+        'src/tinput.c',
 )

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' ]