Changeset d63c842 in mainline


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed

  • install.sh

    r5852a5a rd63c842  
    1818        # The properly separated headers are installed by the meson script.
    1919
    20         # TODO We don't currently install them all due to image size issues
    21         installed_libs="lib/c lib/gui lib/draw lib/softrend"
    22 
    23         if $CONFIG_DEVEL_FILES; then
    24                 echo "######## Installing headers ########"
    25                 cd ${MESON_SOURCE_ROOT}/uspace
    26 
    27                 incdir="${MESON_INSTALL_DESTDIR_PREFIX}include"
    28 
    29                 for libdir in ${installed_libs}; do
    30                         if [ -d ${libdir} -a ! -d ${libdir}/include ]; then
    31                                 find ${libdir} -maxdepth 1 -name '*.h' -a '!' -path ${libdir}'/doc/*' | sed 's:^lib/::' | xargs --verbose -I'@' install -C -D -m644 -T 'lib/@' ${incdir}'/lib@'
    32                         fi
    33                 done
    34         fi
    35 
    3620) > ${MESON_BUILD_ROOT}/install_custom.log 2>&1

  • uspace/lib/c/meson.build

    r5852a5a rd63c842  
    2222
    2323if CONFIG_DEVEL_FILES
     24        uspace_lib_install_script_text += 'mkdir -p "${MESON_INSTALL_DESTDIR_PREFIX}include/libc"'
     25
    2426        foreach idir : incdirs
    25                 install_subdir(idir, install_dir: 'include' / 'libc', strip_directory: true)
     27                _sdir = meson.current_source_dir() / idir
     28                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${MESON_INSTALL_DESTDIR_PREFIX}include/libc"'.format(_sdir)
    2629        endforeach
    2730endif

  • uspace/lib/meson.build

    r5852a5a rd63c842  
    123123
    124124                        if CONFIG_DEVEL_FILES and installed_libs.contains(l)
    125                                 install_subdir(l / 'include', install_dir: 'include' / 'lib' + l, strip_directory: true)
     125                                _sdir = meson.current_source_dir() / l / 'include'
     126                                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${MESON_INSTALL_DESTDIR_PREFIX}include/lib@1@"'.format(_sdir, l)
    126127                        endif
    127128                else
    128129                        includes += include_directories(l)
     130
     131                        if CONFIG_DEVEL_FILES and installed_libs.contains(l)
     132                                _sdir = meson.current_source_dir() / l
     133                                uspace_lib_install_script_text += 'mkdir -p "${MESON_INSTALL_DESTDIR_PREFIX}include/lib@0@"'.format(l)
     134                                uspace_lib_install_script_text += 'cp -L -t "${MESON_INSTALL_DESTDIR_PREFIX}include/lib@0@" "@1@"/*.h'.format(l, _sdir)
     135                        endif
    129136                endif
    130137        endif

  • uspace/meson.build

    r5852a5a rd63c842  
    77install_debug_files = false
    88
     9install_files = []
     10install_deps = []
     11
    912subdir('lib')
    1013subdir('app')
    … …  
    1215subdir('drv')
    1316
    14 install_files = []
    15 install_deps = []
    1617dirs = []
    1718
Note: See TracChangeset for help on using the changeset viewer.