Changeset 740e952 in mainline for uspace

Timestamp:

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

b2695b9

Parents:

71069a9

git-author:

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

git-committer:

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

Message:

more install tweaks

Location:

uspace

Files:

• lib/meson.build (modified) (2 diffs)
• meson.build (modified) (2 diffs)

uspace/lib/meson.build

@@ -317 +317 @@
                 cpp_args: arch_uspace_c_args,
                 link_args: arch_uspace_c_args + arch_uspace_link_args + _ldargs,
+                build_by_default: true,
         )
 
@@ -328 +329 @@
                         output: _test_binname + '.disasm',
                         capture: true,
-                        install: install_debug_files,
-                        install_dir: 'debug' / 'test',
-                )
-
-                install_files += [[ 'debug/test', _disasm.full_path(), _test_binname + '.disasm' ]]
-                install_deps += [ _disasm ]
+                        build_by_default: true,
+                )
+
+                if install_debug_files
+                        install_files += [[ 'debug/test', _disasm.full_path(), _test_binname + '.disasm' ]]
+                        install_deps += [ _disasm ]
+                endif
         endif
 endforeach

uspace/meson.build

@@ -6 +6 @@
 # This is currently disabled due to boot image size restrictions.
 install_debug_files = false
-
-install_files = []
-install_deps = []
 
 subdir('lib')
@@ -203 +200 @@
         endif
 endforeach
-
-uspace_bin_install_script_text = []
-
-foreach f : install_files
-        _cmd = 'mkdir -p "${MESON_INSTALL_DESTDIR_PREFIX}@0@" && cp -L -T "@1@" "${MESON_INSTALL_DESTDIR_PREFIX}@0@/@2@"'
-        uspace_bin_install_script_text += _cmd.format(f[0], f[1], f[2])
-endforeach
-
-uspace_install_script_text = uspace_lib_install_script_text + uspace_bin_install_script_text
-
-# Emit and register the install script.
-
-configure_file(
-        configuration: { 'text' : '\n'.join(uspace_install_script_text) },
-        input: 'install.sh.in',
-        output: 'install.sh',
-)
-
-meson.add_install_script(meson.current_build_dir() / 'install.sh')