Changeset 7749646 in mainline for uspace/lib

Timestamp:

2019-08-17T12:49:44Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6068476

Parents:

e3737eda

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-16 17:44:58)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:44)

Message:

Add tools/export.sh to replace make export

Location:

uspace/lib

Files:

• c/meson.build (modified) (1 diff)
• meson.build (modified) (2 diffs)
• posix/meson.build (modified) (1 diff)

uspace/lib/c/meson.build

@@ -21 +21 @@
 #        we should instead move the duplicated library parts into a shared location.
 
-if CONFIG_DEVEL_FILES
-        uspace_lib_install_script_text += 'mkdir -p "${DESTDIR}include/libc"'
-
-        foreach idir : incdirs
-                _sdir = meson.current_source_dir() / idir
-                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/libc"'.format(_sdir)
-        endforeach
-endif
+uspace_lib_devel_install_script_text += 'mkdir -p "${DESTDIR}include/libc"'
+foreach idir : incdirs
+        _sdir = meson.current_source_dir() / idir
+        uspace_lib_devel_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/libc"'.format(_sdir)
+endforeach
 
 src = [ arch_src ]

uspace/lib/meson.build

@@ -64 +64 @@
 
 # Text of the install script.
-uspace_lib_install_script_text = []
+uspace_lib_devel_install_script_text = []
 
 foreach l : libs
@@ -121 +121 @@
                         includes += include_directories(incdir)
 
-                        if CONFIG_DEVEL_FILES and installed_libs.contains(l)
+                        if installed_libs.contains(l)
                                 _sdir = meson.current_source_dir() / l / 'include'
-                                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/lib@1@"'.format(_sdir, l)
+                                uspace_lib_devel_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/lib@1@"'.format(_sdir, l)
                         endif
                 else
                         includes += include_directories(l)
 
-                        if CONFIG_DEVEL_FILES and installed_libs.contains(l)
+                        if installed_libs.contains(l)
                                 _sdir = meson.current_source_dir() / l
-                                uspace_lib_install_script_text += 'mkdir -p "${DESTDIR}include/lib@0@"'.format(l)
-                                uspace_lib_install_script_text += 'cp -L -t "${DESTDIR}include/lib@0@" "@1@"/*.h || true'.format(l, _sdir)
+                                uspace_lib_devel_install_script_text += 'mkdir -p "${DESTDIR}include/lib@0@"'.format(l)
+                                uspace_lib_devel_install_script_text += 'cp -L -t "${DESTDIR}include/lib@0@" "@1@"/*.h || true'.format(l, _sdir)
                         endif
                 endif

uspace/lib/posix/meson.build

@@ -34 +34 @@
 )
 
+_sdir = meson.current_source_dir() / 'include' / 'posix'
+uspace_lib_devel_install_script_text += 'mkdir -p "${DESTDIR}include/libposix"'
+uspace_lib_devel_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/libposix"'.format(_sdir)
+
 # TODO: exports