Changeset a8ccc7e 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:

2b2783b

Parents:

7b1ae09

git-author:

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

git-committer:

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

Message:

Make the installation workaround less esoteric

Files:

• install.sh (modified) (1 diff)
• uspace/install.sh.in (added)
• uspace/meson.build (modified) (2 diffs)

install.sh

@@ -34 +34 @@
         fi
 
-        # Due to certain quirks of our build, executables need to be built with a different name than what they are installed with.
-        # Meson doesn't support renaming installed files (at least not as of mid-2019) so we do it here manually.
-
-        echo "######## Installing executables ########"
-
-        cd ${MESON_BUILD_ROOT}/uspace
-
-        find -name 'install@*' |
-                sed -e 'h; s:^.*/install@:@DESTDIR@:; s:\$:/:g; x; G; s:\s: :g' -e "s:@DESTDIR@:${MESON_INSTALL_DESTDIR_PREFIX}:g" |
-                xargs -L1 --verbose install -C -D -m755 -T
-
 ) > ${MESON_BUILD_ROOT}/install_custom.log 2>&1

uspace/meson.build

@@ -133 +133 @@
 endforeach
 
+install_script_text = []
+
 foreach tst : bin_targets
         _ldargs = tst.get('link_args')
         _src = tst.get('src')
 
-        _install_dir = tst.get('install_dir').split('/')
-        _install_dir += tst.get('basename')
         _install = tst.get('install')
+        _install_dir = tst.get('install_dir')
+        _basename = tst.get('basename')
+        _full_install_path = _install_dir / _basename
+        _build_name = _full_install_path.underscorify()
+        _full_build_name = meson.current_build_dir() / _build_name
 
         if _install
-                _install_name = 'install@' + '$'.join(_install_dir)
-        else
-                _install_name = '_'.join(_install_dir)
-        endif
-
-        if _install and install_debug_files
-                _debug_name = 'install@' + '$'.join([ 'debug' ] + _install_dir)
-        else
-                _debug_name = '_'.join(_install_dir)
+                # Due to certain quirks of our build, executables need to be built with a different name than what they are installed with.
+                # Meson doesn't support renaming installed files (at least not as of mid-2019) so we do it here manually.
+
+                install_script_text += [
+                        'mkdir -p ${MESON_INSTALL_DESTDIR_PREFIX}"@0@"'.format(_install_dir),
+                        'cp "@0@" ${MESON_INSTALL_DESTDIR_PREFIX}"@1@"'.format(_full_build_name, _full_install_path),
+                ]
+
+                if install_debug_files
+                        install_script_text += [
+                                'cp "@0@".disasm ${MESON_INSTALL_DESTDIR_PREFIX}debug/"@1@".disasm'.format(_full_build_name, _full_install_path),
+                                'cp "@0@".map ${MESON_INSTALL_DESTDIR_PREFIX}debug/"@1@".map'.format(_full_build_name, _full_install_path)
+                        ]
+                endif
         endif
 
         if link_map
                 # We want linker to generate link map for debugging.
-                _ldargs += [ '-Wl,-Map,' + meson.current_build_dir() / _debug_name + '.map' ]
-        endif
-
-        _bin = executable(_install_name, _src,
+                _ldargs += [ '-Wl,-Map,' + _full_build_name + '.map' ]
+        endif
+
+        _bin = executable(_build_name, _src,
                 include_directories: tst.get('includes'),
                 dependencies: tst.get('dependencies'),
@@ -167 +177 @@
                 implicit_include_directories: false,
                 install: false,
-                #install_dir: tst.get('install_dir'),
+                #install_dir: _install_dir,
                 build_by_default: true,
         )
 
         if disassemble
-                custom_target(_debug_name + '.disasm',
+                custom_target(_build_name + '.disasm',
                         command: [ objdump, '-S', '@INPUT@' ],
                         input: _bin,
-                        output: _debug_name + '.disasm',
+                        output: _build_name + '.disasm',
                         capture: true,
                         install: false,
-                        #install_dir: 'debug' / tst.get('install_dir'),
+                        #install_dir: 'debug' / _install_dir,
                         build_by_default: true,
                 )
         endif
 endforeach
+
+# Emit and register the install script.
+
+configure_file(
+        configuration: { 'text' : '\n'.join(install_script_text) },
+        input: 'install.sh.in',
+        output: 'install.sh',
+)
+
+meson.add_install_script(meson.current_build_dir() / 'install.sh')