Changeset d63c842 in mainline

Timestamp:

2019-08-17T12:49:43Z (5 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:

68b892a

Parents:

5852a5a

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-27 15:12:17)

git-committer:

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

Message:

more unification

Files:

• install.sh (modified) (1 diff)
• uspace/lib/c/meson.build (modified) (1 diff)
• uspace/lib/meson.build (modified) (1 diff)
• uspace/meson.build (modified) (2 diffs)

install.sh

@@ -18 +18 @@
         # The properly separated headers are installed by the meson script.
 
-        # TODO We don't currently install them all due to image size issues
-        installed_libs="lib/c lib/gui lib/draw lib/softrend"
-
-        if $CONFIG_DEVEL_FILES; then
-                echo "######## Installing headers ########"
-                cd ${MESON_SOURCE_ROOT}/uspace
-
-                incdir="${MESON_INSTALL_DESTDIR_PREFIX}include"
-
-                for libdir in ${installed_libs}; do
-                        if [ -d ${libdir} -a ! -d ${libdir}/include ]; then
-                                find ${libdir} -maxdepth 1 -name '*.h' -a '!' -path ${libdir}'/doc/*' | sed 's:^lib/::' | xargs --verbose -I'@' install -C -D -m644 -T 'lib/@' ${incdir}'/lib@'
-                        fi
-                done
-        fi
-
 ) > ${MESON_BUILD_ROOT}/install_custom.log 2>&1

uspace/lib/c/meson.build

@@ -22 +22 @@
 
 if CONFIG_DEVEL_FILES
+        uspace_lib_install_script_text += 'mkdir -p "${MESON_INSTALL_DESTDIR_PREFIX}include/libc"'
+
         foreach idir : incdirs
-                install_subdir(idir, install_dir: 'include' / 'libc', strip_directory: true)
+                _sdir = meson.current_source_dir() / idir
+                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${MESON_INSTALL_DESTDIR_PREFIX}include/libc"'.format(_sdir)
         endforeach
 endif

uspace/lib/meson.build

@@ -123 +123 @@
 
                         if CONFIG_DEVEL_FILES and installed_libs.contains(l)
-                                install_subdir(l / 'include', install_dir: 'include' / 'lib' + l, strip_directory: true)
+                                _sdir = meson.current_source_dir() / l / 'include'
+                                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${MESON_INSTALL_DESTDIR_PREFIX}include/lib@1@"'.format(_sdir, l)
                         endif
                 else
                         includes += include_directories(l)
+
+                        if CONFIG_DEVEL_FILES and installed_libs.contains(l)
+                                _sdir = meson.current_source_dir() / l
+                                uspace_lib_install_script_text += 'mkdir -p "${MESON_INSTALL_DESTDIR_PREFIX}include/lib@0@"'.format(l)
+                                uspace_lib_install_script_text += 'cp -L -t "${MESON_INSTALL_DESTDIR_PREFIX}include/lib@0@" "@1@"/*.h'.format(l, _sdir)
+                        endif
                 endif
         endif

uspace/meson.build

@@ -7 +7 @@
 install_debug_files = false
 
+install_files = []
+install_deps = []
+
 subdir('lib')
 subdir('app')
@@ -12 +15 @@
 subdir('drv')
 
-install_files = []
-install_deps = []
 dirs = []