Changeset 68b892a 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:

ad5c4959

Parents:

d63c842

git-author:

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

git-committer:

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

Message:

Do more installs using custom script

File:

• uspace/lib/meson.build (modified) (9 diffs)

uspace/lib/meson.build

@@ -65 +65 @@
 # Text of the install script.
 uspace_lib_install_script_text = []
-uspace_lib_install_depends = []
 
 foreach l : libs
@@ -146 +145 @@
         endif
 
-        # TODO: install mapfile if install_debug_data is true
         mapfile = meson.current_build_dir() / 'lib' + l + '.map'
 
@@ -175 +173 @@
         if src.length() > 0
                 if not always_static
+                        _libname = 'lib' + l + '.so.' + version.split('.')[0]
+
                         _shared_lib = shared_library(l, src,
                                 # TODO: Include private headers using #include "quoted",
@@ -185 +185 @@
                                 version: version,
                                 build_by_default: true,
-                                install: install_shared_lib,
-                                install_dir: 'lib',
                         )
 
+                        if install_shared_lib
+                                install_files += [[ 'lib', _shared_lib.full_path(), _libname ]]
+                                install_deps += [ _shared_lib ]
+                        endif
+
+                        if install_shared_lib and install_debug_files
+                                install_files += [[ 'debug/lib', mapfile, _libname + '.map' ]]
+                        endif
+
                         if disassemble
-                                custom_target('lib' + l + '.disasm',
+                                _disasm = custom_target('lib' + l + '.disasm',
                                         command: [ objdump, '-S', '@INPUT@' ],
                                         input: _shared_lib,
@@ -196 +203 @@
                                         capture: true,
                                         build_by_default: true,
-                                        install: install_debug_files,
-                                        install_dir: join_paths('debug', 'lib'),
                                 )
+
+                                if install_shared_lib and install_debug_files
+                                        install_files += [[ 'debug/lib', _disasm.full_path(), _libname + '.disasm' ]]
+                                        install_deps += [ _disasm ]
+                                endif
                         endif
 
@@ -217 +227 @@
                         c_args: arch_uspace_c_args + c_args,
                         cpp_args: arch_uspace_c_args + c_args,
-                        install: install_static_lib,
-                        install_dir: 'lib',
-                )
+                )
+
+                if install_static_lib
+                        install_files += [[ 'lib', _static_lib.full_path(), 'lib' + l + '.a' ]]
+                        install_deps += [ _static_lib ]
+                endif
 
                 _static_dep = declare_dependency(
@@ -301 +314 @@
                 dependencies: [ get_variable('lib' + _libname).get('any'), libpcut.get('any') ],
                 objects: startfiles,
-                install: true,
-                install_dir: 'test',
                 c_args: arch_uspace_c_args,
                 cpp_args: arch_uspace_c_args,
@@ -308 +319 @@
         )
 
+        install_files += [[ 'test', _bin.full_path(), _test_binname ]]
+        install_deps += [ _bin ]
+
         if disassemble
-                custom_target(_test_binname + '.disasm',
+                _disasm = custom_target(_test_binname + '.disasm',
                         command: [ objdump, '-S', '@INPUT@' ],
                         input: _bin,
@@ -317 +331 @@
                         install_dir: 'debug' / 'test',
                 )
+
+                install_files += [[ 'debug/test', _disasm.full_path(), _test_binname + '.disasm' ]]
+                install_deps += [ _disasm ]
         endif
 endforeach